From 6a5cd597851c9fc066448f421e032e263fb72c79 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Wed, 12 Nov 2008 21:48:31 +0000 Subject: [PATCH] fetchmail.php: - allow superadmin to create fetchmail entry for any mailbox, not only for himself https://sourceforge.net/tracker/index.php?func=detail&aid=2147740&group_id=191583&atid=937964 upgrade.php, fetchmail.php, fetchmail.pl: - rename fetchmail ssl field to usessl - "ssl" is a reserved word in MySQL and therefore causes various problems (we would need to quote the field name everywhere) https://sourceforge.net/tracker/index.php?func=detail&aid=2265333&group_id=191583&atid=937964 languages/*.lang: - renamed strings for fetchmail (use)ssl field git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@479 a1433add-5e2c-0410-b055-b7f2511e0802 --- ADDITIONS/fetchmail.pl | 6 +++--- fetchmail.php | 9 +++++++-- languages/bg.lang | 4 ++-- languages/ca.lang | 4 ++-- languages/cn.lang | 4 ++-- languages/cs.lang | 4 ++-- languages/da.lang | 4 ++-- languages/de.lang | 4 ++-- languages/en.lang | 4 ++-- languages/es.lang | 4 ++-- languages/et.lang | 4 ++-- languages/eu.lang | 4 ++-- languages/fi.lang | 4 ++-- languages/fo.lang | 4 ++-- languages/fr.lang | 4 ++-- languages/hr.lang | 4 ++-- languages/hu.lang | 4 ++-- languages/is.lang | 4 ++-- languages/it.lang | 4 ++-- languages/ja.lang | 4 ++-- languages/lt.lang | 4 ++-- languages/mk.lang | 4 ++-- languages/nb.lang | 4 ++-- languages/nl.lang | 4 ++-- languages/nn.lang | 4 ++-- languages/pl.lang | 4 ++-- languages/pt-br.lang | 4 ++-- languages/ru.lang | 4 ++-- languages/sk.lang | 4 ++-- languages/sl.lang | 4 ++-- languages/sv.lang | 4 ++-- languages/tr.lang | 4 ++-- languages/tw.lang | 4 ++-- upgrade.php | 9 +++++++++ 34 files changed, 81 insertions(+), 67 deletions(-) diff --git a/ADDITIONS/fetchmail.pl b/ADDITIONS/fetchmail.pl index c7872043..04013a83 100644 --- a/ADDITIONS/fetchmail.pl +++ b/ADDITIONS/fetchmail.pl @@ -18,14 +18,14 @@ $dsn = "DBI:mysql:database=$database;host=$hostname"; $dbh = DBI->connect($dsn, $user, $password) || die "cannot connect the database"; $sql=< poll_time*60 SQL my (%config); map{ - my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$ssl)=@$_; + my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl)=@$_; $cmd="user '${src_user}' there with password '".decode_base64($src_password)."'"; $cmd.=" folder '${src_folder}'" if ($src_folder); @@ -36,7 +36,7 @@ map{ $cmd.=" keep" if ($keep); $cmd.=" fetchall" if ($fetchall); - $cmd.=" ssl" if ($ssl); + $cmd.=" ssl" if ($usessl); $cmd.=" ".$extra_options if ($extra_options); $text=< array(1, 1, 'bool' ), "keep" => array(1, 1, 'bool' ), "protocol" => array(1, 1, 'enum' ), - "ssl" => array(1, 1, 'bool' ), + "usessl" => array(1, 1, 'bool' ), "extra_options" => array($extra_options, $extra_options, 'longtext' ), "mda" => array($extra_options, $extra_options, 'longtext' ), "date" => array(0, $display_status, 'text' ), @@ -92,7 +92,12 @@ $fm_defaults=array( $table_fetchmail = table_by_key('fetchmail'); $table_mailbox = table_by_key('mailbox'); -$list_domains = list_domains_for_admin ($SESSID_USERNAME); +if (authentication_has_role('global-admin')) { + $list_domains = list_domains (); +} else { + $list_domains = list_domains_for_admin(authentication_get_username()); +} + $user_domains=implode(", ",array_values($list_domains)); # for displaying $user_domains_sql=implode("','",escape_string(array_values($list_domains))); # for SQL $sql="SELECT username FROM $table_mailbox WHERE domain in ('".$user_domains_sql."')"; # TODO: replace with domain selection dropdown diff --git a/languages/bg.lang b/languages/bg.lang index 8241978d..67c5c67e 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index cdb3639a..ac81313f 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index 35bcae73..28b8c862 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/cs.lang b/languages/cs.lang index 8a8281a9..99dacca6 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -409,7 +409,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Interval'; $PALANG['pFetchmail_field_fetchall'] = 'Stahovat vše'; $PALANG['pFetchmail_field_keep'] = 'Nemazat'; $PALANG['pFetchmail_field_protocol'] = 'Protokol'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Parametry'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -425,7 +425,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Stahovat každých ... minut'; $PALANG['pFetchmail_desc_fetchall'] = 'Získávat všechny staré (přečtené) i nové zprávy'; $PALANG['pFetchmail_desc_keep'] = 'Ponechávat stažené zprávy na vzdáleném mailserveru'; $PALANG['pFetchmail_desc_protocol'] = 'Použitý protokol'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra parametry pro fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Program pro doručení pošty do schránky (MDA)'; $PALANG['pFetchmail_desc_date'] = 'Datum posledního stažení pošty/změny konfigurace'; diff --git a/languages/da.lang b/languages/da.lang index 683501f6..337d5543 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -409,7 +409,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Prøve'; $PALANG['pFetchmail_field_fetchall'] = 'Hent alle'; $PALANG['pFetchmail_field_keep'] = 'Behold'; $PALANG['pFetchmail_field_protocol'] = 'Protokol'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Ekstra tilvalg'; $PALANG['pFetchmail_field_mda'] = 'MDA (Mail Delivery Agent)'; $PALANG['pFetchmail_field_date'] = 'Dato'; @@ -425,7 +425,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Prøv hver ... minut'; $PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle (sete) og nye beskeder'; $PALANG['pFetchmail_desc_keep'] = 'Gem hentede beskeder på den eksterne postserver'; $PALANG['pFetchmail_desc_protocol'] = 'Brug protokol'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail flag'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Dato for seneste prøve/konfigurationsændring'; diff --git a/languages/de.lang b/languages/de.lang index 19ad1659..4b1b7200 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -409,7 +409,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Abruf'; $PALANG['pFetchmail_field_fetchall'] = 'Alle abholen'; $PALANG['pFetchmail_field_keep'] = 'Behalten'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; -$PALANG['pFetchmail_field_ssl'] = 'SSL aktiv'; +$PALANG['pFetchmail_field_usessl'] = 'SSL aktiv'; $PALANG['pFetchmail_field_extra_options'] = 'Zusätzliche Optionen'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -425,7 +425,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Mailabruf alle ... Minuten'; $PALANG['pFetchmail_desc_fetchall'] = 'Sowohl alte (gelesene) als auch neue Nachrichten abholen'; $PALANG['pFetchmail_desc_keep'] = 'Abgeholte Nachrichten auf dem entfernten Server lassen'; $PALANG['pFetchmail_desc_protocol'] = 'Zu verwendendes Protokoll'; -$PALANG['pFetchmail_desc_ssl'] = 'Verschlüsselung mit SSL'; +$PALANG['pFetchmail_desc_usessl'] = 'Verschlüsselung mit SSL'; $PALANG['pFetchmail_desc_extra_options'] = 'Zusätzliche fetchmail-Optionen'; $PALANG['pFetchmail_desc_mda'] = 'Programm zur Mailauslieferung'; $PALANG['pFetchmail_desc_date'] = 'Datum des letzten Mailabrufs/Konfigurationsänderung'; diff --git a/languages/en.lang b/languages/en.lang index 3c260a1c..e5740d42 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -410,7 +410,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; $PALANG['pFetchmail_field_keep'] = 'Keep'; $PALANG['pFetchmail_field_protocol'] = 'Protocol'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Date'; @@ -426,7 +426,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; diff --git a/languages/es.lang b/languages/es.lang index 63def0d6..56de1a5b 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/et.lang b/languages/et.lang index d33f8393..4af46eb5 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -401,7 +401,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -417,7 +417,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/eu.lang b/languages/eu.lang index dd6230e3..b76946d2 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -396,7 +396,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,7 +412,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/fi.lang b/languages/fi.lang index 4093271e..054cf0f4 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -399,7 +399,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -415,7 +415,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/fo.lang b/languages/fo.lang index 8dbaa548..6be24504 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -402,7 +402,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -418,7 +418,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/fr.lang b/languages/fr.lang index ab28daef..bc3560cc 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -399,7 +399,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Fréquence'; $PALANG['pFetchmail_field_fetchall'] = 'Tout récupérer'; $PALANG['pFetchmail_field_keep'] = 'Conserver'; $PALANG['pFetchmail_field_protocol'] = 'Protocole'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Options supplémentaires'; $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -415,7 +415,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Vérifier toutes les ... minutes' $PALANG['pFetchmail_desc_fetchall'] = 'Récupérer tous les messages, nouveaux et déjà lus'; $PALANG['pFetchmail_desc_keep'] = 'Conserver une copie des messages sur le serveur'; $PALANG['pFetchmail_desc_protocol'] = 'Protocole à utiliser'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Options supplémentaires de Fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date dernière vérification/changement configuration'; diff --git a/languages/hr.lang b/languages/hr.lang index a81795b9..acd287b8 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -396,7 +396,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,7 +412,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/hu.lang b/languages/hu.lang index 837d062c..343b023b 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -410,7 +410,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -426,7 +426,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/is.lang b/languages/is.lang index 7bf306e7..96329686 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -396,7 +396,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,7 +412,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/it.lang b/languages/it.lang index 027eccc4..7b50bcd4 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Scansione'; $PALANG['pFetchmail_field_fetchall'] = 'Ricevi tutto'; $PALANG['pFetchmail_field_keep'] = 'Conserva'; $PALANG['pFetchmail_field_protocol'] = 'Protocollo'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Data'; @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Recupera ogni ... minuti'; $PALANG['pFetchmail_desc_fetchall'] = 'Recupera anche i messaggi già letti'; $PALANG['pFetchmail_desc_keep'] = 'Conserva una copia del messaggi sul server remoto'; $PALANG['pFetchmail_desc_protocol'] = 'Protocollo da usare'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Opzioni extra'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Data dell\'ultima modifica o attività'; diff --git a/languages/ja.lang b/languages/ja.lang index 66ac79c2..165623f8 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -408,7 +408,7 @@ $PALANG['pFetchmail_field_poll_time'] = '間隔'; $PALANG['pFetchmail_field_fetchall'] = 'すべて取得'; $PALANG['pFetchmail_field_keep'] = '残す'; $PALANG['pFetchmail_field_protocol'] = 'プロトコル'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = '追加オプション'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = '日付'; @@ -424,7 +424,7 @@ $PALANG['pFetchmail_desc_poll_time'] = '分単位の確認間隔'; $PALANG['pFetchmail_desc_fetchall'] = '既読と新着メッセージを取得するか'; $PALANG['pFetchmail_desc_keep'] = 'リモートサーバに取得済メッセージを残すか'; $PALANG['pFetchmail_desc_protocol'] = '利用するプロトコル'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = '追加の fetchmail オプション'; $PALANG['pFetchmail_desc_mda'] = 'メール配送エージェント (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = '最終取得確認／設定変更日時'; diff --git a/languages/lt.lang b/languages/lt.lang index 69871dca..f8949f8d 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/mk.lang b/languages/mk.lang index 52790138..772c6af4 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/nb.lang b/languages/nb.lang index 7b752b1c..fbe9484f 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Spørringsintervall'; $PALANG['pFetchmail_field_fetchall'] = 'Hent alt'; $PALANG['pFetchmail_field_keep'] = 'Behold'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Ekstra alternativer'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Dato'; @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Se etter meldinger hvert ... minu $PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle og nye meldinger'; $PALANG['pFetchmail_desc_keep'] = 'Behold meldingene på den eksterne e-postserveren'; $PALANG['pFetchmail_desc_protocol'] = 'Protokoll som skal brukes'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail-alternativer'; $PALANG['pFetchmail_desc_mda'] = 'E-postleveringsagent (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = 'Dato for siste spørring/konfigurasjonsendring'; diff --git a/languages/nl.lang b/languages/nl.lang index f834315b..360340b8 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'controle'; $PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen'; $PALANG['pFetchmail_field_keep'] = 'behouden'; $PALANG['pFetchmail_field_protocol'] = 'protocol'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'extra opties'; $PALANG['pFetchmail_field_mda'] = 'MD'; $PALANG['pFetchmail_field_date'] = 'datum'; @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Check iedere ... minuten.'; $PALANG['pFetchmail_desc_fetchall'] = 'Haal zowel oude (gelezen) als nieuwe berichten op.'; $PALANG['pFetchmail_desc_keep'] = 'Opgehaalde berichten op de server achterlaten.'; $PALANG['pFetchmail_desc_protocol'] = 'het te gebruiken protocol.'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'extra opties voor fetchmail.'; $PALANG['pFetchmail_desc_mda'] = 'mail delivery agent.'; $PALANG['pFetchmail_desc_date'] = 'datum van de laatste berichtencontrole/configuratie verandering.'; diff --git a/languages/nn.lang b/languages/nn.lang index 5c5b2759..313399a6 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -394,7 +394,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -410,7 +410,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/pl.lang b/languages/pl.lang index 565a60ed..bc966ebf 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -402,7 +402,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Sprawdzaj'; $PALANG['pFetchmail_field_fetchall'] = 'Pobierz wszystkie'; $PALANG['pFetchmail_field_keep'] = 'Pozostaw'; $PALANG['pFetchmail_field_protocol'] = 'Protokół'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Dodatkowe opcje'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Data'; @@ -418,7 +418,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Pobierz co ... minut'; $PALANG['pFetchmail_desc_fetchall'] = 'Pobierz zarówno stare (przeczytane) jak i nowe wiadomości'; $PALANG['pFetchmail_desc_keep'] = 'Pozostaw wiadomości na serwerze'; $PALANG['pFetchmail_desc_protocol'] = 'Protokół'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Dodatkowe opcje dla fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Data ostatniego sprawdzenia/zmiany konfiguracji'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index fd75af4a..f37f2046 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/ru.lang b/languages/ru.lang index 393987cd..8e1ef641 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -410,7 +410,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Опрашивать'; $PALANG['pFetchmail_field_fetchall'] = 'Скачивать все'; $PALANG['pFetchmail_field_keep'] = 'Не удалять'; $PALANG['pFetchmail_field_protocol'] = 'Протокол'; -$PALANG['pFetchmail_field_ssl'] = 'Включить SSL'; +$PALANG['pFetchmail_field_usessl'] = 'Включить SSL'; $PALANG['pFetchmail_field_extra_options'] = 'Дополнительные параметры'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Дата'; @@ -426,7 +426,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Опрашивать каждые $PALANG['pFetchmail_desc_fetchall'] = 'Скачивать и старые (виденные), и новые сообщения'; $PALANG['pFetchmail_desc_keep'] = 'Не удалять скачанные сообщения с удаленного сервера'; $PALANG['pFetchmail_desc_protocol'] = 'Какой протокол использовать'; -$PALANG['pFetchmail_desc_ssl'] = 'Шифрование SSL'; +$PALANG['pFetchmail_desc_usessl'] = 'Шифрование SSL'; $PALANG['pFetchmail_desc_extra_options'] = 'Дополнительные параметры fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Агент доставки почты (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = 'Дата последнего опроса/изменения конфигурации'; diff --git a/languages/sk.lang b/languages/sk.lang index 4bd24f0e..9c5bc7fc 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/sl.lang b/languages/sl.lang index 3f935fc2..c301dbc8 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/sv.lang b/languages/sv.lang index c00f1e61..4538ec03 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -399,7 +399,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Kontrollera'; $PALANG['pFetchmail_field_fetchall'] = 'Hämta samtliga'; $PALANG['pFetchmail_field_keep'] = 'Behåll'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra inställningsmöjligheter'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -415,7 +415,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Kontrollera varje ... minut'; $PALANG['pFetchmail_desc_fetchall'] = 'Hämta både gamla lästa (visade) brev och nya'; $PALANG['pFetchmail_desc_keep'] = 'Behåll hämtade brev på mailservern'; $PALANG['pFetchmail_desc_protocol'] = 'Använd följande protokoll'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail inställningar'; $PALANG['pFetchmail_desc_mda'] = 'Mailserveragent (MDA)'; $PALANG['pFetchmail_desc_date'] = 'Datum för senaste kontroll/konfigurationsändring'; diff --git a/languages/tr.lang b/languages/tr.lang index eb0300b5..6b61c8d8 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/languages/tw.lang b/languages/tw.lang index 688cfc98..1107c666 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX diff --git a/upgrade.php b/upgrade.php index 8d1f8ec2..6a8280ed 100644 --- a/upgrade.php +++ b/upgrade.php @@ -990,4 +990,13 @@ function upgrade_473_mysql() { } } +function upgrade_479_mysql () { + # ssl is a reserved word in MySQL and causes several problems. Renaming the field... + $table_fmail = table_by_key('fetchmail'); + db_query_parsed("ALTER TABLE `$table_fmail` CHANGE `ssl` `usessl` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"); +} +function upgrade_479_pgsql () { + $table_fmail = table_by_key('fetchmail'); + db_query_parsed("alter table $table_fmail rename column ssl to usessl"); +}