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

@@ -18,14 +18,14 @@ $dsn = "DBI:mysql:database=$database;host=$hostname";
 $dbh = DBI->connect($dsn, $user, $password) || die "cannot connect the database";
 
 $sql=<<SQL;
-SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,ssl 
+SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,usessl 
 FROM fetchmail
 WHERE unix_timestamp(now())-unix_timestamp(date) > 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=<<TXT;

fetchmail.php

@@ -63,7 +63,7 @@ $fm_struct=array(   //   list($editible,$view,$type)
    "fetchall"        => 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

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

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

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

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';

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';

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';

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';

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

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

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

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

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

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';

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

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

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

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à';

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']             = '最終取得確認／設定変更日時';

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

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

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';

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.';

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

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';

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

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']             = 'Дата последнего опроса/изменения конфигурации';

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

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

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';

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

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

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");
+}