From d35e66808b85e4e3741a61bb4642c49177f4b4a8 Mon Sep 17 00:00:00 2001 From: Christoph 'SuperVirus' Heitkamp Date: Mon, 17 Dec 2018 12:10:25 +0100 Subject: [PATCH] Allow different port for fetchmail --- ADDITIONS/fetchmail.pl | 7 ++++--- languages/bg.lang | 2 ++ languages/ca.lang | 2 ++ languages/cn.lang | 2 ++ languages/cs.lang | 2 ++ languages/da.lang | 2 ++ languages/de.lang | 2 ++ languages/en.lang | 2 ++ languages/es.lang | 2 ++ languages/et.lang | 2 ++ languages/eu.lang | 2 ++ languages/fi.lang | 2 ++ languages/fo.lang | 2 ++ languages/fr.lang | 2 ++ languages/hr.lang | 2 ++ languages/hu.lang | 2 ++ languages/is.lang | 2 ++ languages/it.lang | 2 ++ languages/ja.lang | 2 ++ languages/lt.lang | 2 ++ languages/mk.lang | 2 ++ languages/nb.lang | 2 ++ languages/nl.lang | 2 ++ languages/nn.lang | 2 ++ languages/pl.lang | 2 ++ languages/pt-br.lang | 2 ++ languages/ro.lang | 2 ++ languages/ru.lang | 2 ++ languages/sk.lang | 2 ++ languages/sl.lang | 2 ++ languages/sv.lang | 2 ++ languages/tr.lang | 2 ++ languages/tw.lang | 2 ++ model/FetchmailHandler.php | 1 + public/upgrade.php | 5 +++++ 35 files changed, 74 insertions(+), 3 deletions(-) diff --git a/ADDITIONS/fetchmail.pl b/ADDITIONS/fetchmail.pl index f68c4aa1..c6ad9f9d 100644 --- a/ADDITIONS/fetchmail.pl +++ b/ADDITIONS/fetchmail.pl @@ -120,10 +120,11 @@ set no spambounce set properties "" set syslog -poll ${src_server} with proto ${protocol} - $cmd - TXT + $text.="poll ${src_server} with proto ${protocol}"; + $text.=" service ${src_port}" if ($src_port); + $text.="\n $cmd"; + ($file_handler, $filename) = mkstemp( "/tmp/fetchmail-all-XXXXX" ) or log_and_die "cannot open/create fetchmail temp file"; print $file_handler $text; diff --git a/languages/bg.lang b/languages/bg.lang index 5f3eca79..a28340ea 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -360,6 +360,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -379,6 +380,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index 7b215641..02590062 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -359,6 +359,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -378,6 +379,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index 70a73baf..222d9c9b 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -359,6 +359,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -378,6 +379,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/cs.lang b/languages/cs.lang index fc6fa615..a676a000 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -373,6 +373,7 @@ $PALANG['pFetchmail_password_missing'] = 'Prosím zadejte heslo ke vzdálené sc $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Schránka'; $PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Typ autentizace'; $PALANG['pFetchmail_field_src_user'] = 'Uživatel'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -392,6 +393,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Výstupní text'; $PALANG['pFetchmail_desc_id'] = 'ID záznamu'; $PALANG['pFetchmail_desc_mailbox'] = 'Místní schránka'; $PALANG['pFetchmail_desc_src_server'] = 'Vzdálený server'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Většinou \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Vzdálený uživatel'; $PALANG['pFetchmail_desc_src_password'] = 'Heslo vzdáleného uživatele'; diff --git a/languages/da.lang b/languages/da.lang index 5ced5f43..7120d518 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -373,6 +373,7 @@ $PALANG['pFetchmail_password_missing'] = 'Angiv adgangskoden til fjernserveren!' $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Postboks'; $PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Godkendelsesmetode'; $PALANG['pFetchmail_field_src_user'] = 'Brugernavn'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -392,6 +393,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returneret tekst'; $PALANG['pFetchmail_desc_id'] = 'Post ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Lokal postboks'; $PALANG['pFetchmail_desc_src_server'] = 'Fjernserver'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Somregel \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Eksternt brugernavn'; $PALANG['pFetchmail_desc_src_password'] = 'Ekstern adgangskode'; diff --git a/languages/de.lang b/languages/de.lang index 05bbed38..518ed875 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -371,6 +371,7 @@ $PALANG['pFetchmail_password_missing'] = 'Bitte geben Sie das Passwort ein!'; $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; $PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; $PALANG['pFetchmail_field_src_auth'] = 'Anmeldemethode'; $PALANG['pFetchmail_field_src_user'] = 'Benutzername'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -390,6 +391,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Zurückgegebener Text'; $PALANG['pFetchmail_desc_id'] = 'Eintrags-ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Lokales Postfach'; $PALANG['pFetchmail_desc_src_server'] = 'Entfernter Server'; +$PALANG['pFetchmail_desc_src_port'] = 'Entfernter Port, falls nicht der Standard-Port benutzt werden soll. (0: Standard-Port)'; $PALANG['pFetchmail_desc_src_auth'] = 'Normalerweise \'password\''; $PALANG['pFetchmail_desc_src_user'] = 'Entfernter Benutzername'; $PALANG['pFetchmail_desc_src_password'] = 'Entferntes Passwort'; diff --git a/languages/en.lang b/languages/en.lang index 3baa4053..299d5cbd 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -376,6 +376,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; $PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; $PALANG['pFetchmail_field_src_user'] = 'User'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -395,6 +396,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; $PALANG['pFetchmail_desc_id'] = 'Record ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; diff --git a/languages/es.lang b/languages/es.lang index d335cd66..676f05fa 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -361,6 +361,7 @@ $PALANG['pFetchmail_password_missing'] = '¡Por favor introduzca la contraseña $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Buzón'; $PALANG['pFetchmail_field_src_server'] = 'Servidor'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Tipo Autenticación'; $PALANG['pFetchmail_field_src_user'] = 'Usuario'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -380,6 +381,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Texto Devuelto'; $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Buzón local'; $PALANG['pFetchmail_desc_src_server'] = 'Servidor Remoto'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Usuario Remoto'; $PALANG['pFetchmail_desc_src_password'] = 'Contraseña Remota'; diff --git a/languages/et.lang b/languages/et.lang index 1b657302..01335ff8 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -363,6 +363,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -382,6 +383,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/eu.lang b/languages/eu.lang index 7e35414f..55749b07 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -358,6 +358,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -377,6 +378,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/fi.lang b/languages/fi.lang index 76c7d6a3..179ab3eb 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -359,6 +359,7 @@ $PALANG['pFetchmail_password_missing'] = 'Ole hyvä ja syötä etäkäyttäjän $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Sähköpostilaatikko'; $PALANG['pFetchmail_field_src_server'] = 'Palvelin'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Tunnistautumisen tyyppi'; $PALANG['pFetchmail_field_src_user'] = 'Käyttäjä'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -378,6 +379,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Palautettu teksti'; $PALANG['pFetchmail_desc_id'] = 'Tietue ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Paikallinen sähköpostilaatikko'; $PALANG['pFetchmail_desc_src_server'] = 'Etäpalvelin'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Useimmiten \'password\''; $PALANG['pFetchmail_desc_src_user'] = 'Etäkäyttäjä'; $PALANG['pFetchmail_desc_src_password'] = 'Etäkäyttäjän salasana'; diff --git a/languages/fo.lang b/languages/fo.lang index 6d4325e3..aac7a754 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -364,6 +364,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -383,6 +384,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/fr.lang b/languages/fr.lang index 714504b0..3fe79774 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -367,6 +367,7 @@ $PALANG['pFetchmail_password_missing'] = 'Merci d\'indiquer le mot de passe dist $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Compte courriel'; $PALANG['pFetchmail_field_src_server'] = 'Serveur'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Type Auth'; $PALANG['pFetchmail_field_src_user'] = 'Utilisateur'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -386,6 +387,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Message retour'; $PALANG['pFetchmail_desc_id'] = 'Identifiant'; $PALANG['pFetchmail_desc_mailbox'] = 'Compte courriel local'; $PALANG['pFetchmail_desc_src_server'] = 'Serveur distant'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Surtout \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Utilisateur distant'; $PALANG['pFetchmail_desc_src_password'] = 'Mot de passe distant'; diff --git a/languages/hr.lang b/languages/hr.lang index 0f1ad0ac..06c8c944 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -358,6 +358,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -377,6 +378,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/hu.lang b/languages/hu.lang index 579f2bc3..18a62290 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -372,6 +372,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -391,6 +392,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/is.lang b/languages/is.lang index 54b8e48c..5a6828bd 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -359,6 +359,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -378,6 +379,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/it.lang b/languages/it.lang index f477849d..91104b89 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -360,6 +360,7 @@ $PALANG['pFetchmail_password_missing'] = 'Digita la password per il server remot $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Casella'; $PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Autenticazione'; $PALANG['pFetchmail_field_src_user'] = 'Utente'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -379,6 +380,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Risultato ottenuto'; $PALANG['pFetchmail_desc_id'] = 'Record ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Casella locale'; $PALANG['pFetchmail_desc_src_server'] = 'Server remoto'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Sostanzialmente \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Utente remoto'; $PALANG['pFetchmail_desc_src_password'] = 'Pasword remota'; diff --git a/languages/ja.lang b/languages/ja.lang index 12203646..1930a444 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -370,6 +370,7 @@ $PALANG['pFetchmail_password_missing'] = 'リモートパスワードを入力 $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'メールアドレス'; $PALANG['pFetchmail_field_src_server'] = 'サーバ'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = '認証タイプ'; $PALANG['pFetchmail_field_src_user'] = 'ユーザ'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -389,6 +390,7 @@ $PALANG['pFetchmail_field_returned_text'] = '戻りテキスト'; $PALANG['pFetchmail_desc_id'] = 'レコード ID'; $PALANG['pFetchmail_desc_mailbox'] = 'ローカル メールボックス'; $PALANG['pFetchmail_desc_src_server'] = 'リモート サーバ'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = '大抵は \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'リモート ユーザ'; $PALANG['pFetchmail_desc_src_password'] = 'リモート パスワード'; diff --git a/languages/lt.lang b/languages/lt.lang index da924e4b..2e53c90a 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -365,6 +365,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -384,6 +385,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/mk.lang b/languages/mk.lang index 310b55f8..dd8f41d1 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -360,6 +360,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -379,6 +380,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/nb.lang b/languages/nb.lang index 1eaf74ab..bc9c74a4 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -360,6 +360,7 @@ $PALANG['pFetchmail_password_missing'] = 'Vennligst skriv inn det eksterne passo $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'E-postkonto'; $PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Autentiseringstype'; $PALANG['pFetchmail_field_src_user'] = 'Bruker'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -379,6 +380,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returnert tekst'; $PALANG['pFetchmail_desc_id'] = 'Oppførings-ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Lokal e-postkonto'; $PALANG['pFetchmail_desc_src_server'] = 'Ekstern server'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Vanligvis \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Eksternt brukernavn'; $PALANG['pFetchmail_desc_src_password'] = 'Eksternt passord'; diff --git a/languages/nl.lang b/languages/nl.lang index 12b88a50..3236315f 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -361,6 +361,7 @@ $PALANG['pFetchmail_password_missing'] = 'Wachtwoord!'; $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'mailbox'; $PALANG['pFetchmail_field_src_server'] = 'server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'authenticatietype'; $PALANG['pFetchmail_field_src_user'] = 'gebruiker'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -380,6 +381,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'teruggegeven tekst'; $PALANG['pFetchmail_desc_id'] = 'record ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Naar welke mailbox sturen we de opgehaalde mail.'; $PALANG['pFetchmail_desc_src_server'] = 'andere server.'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'In de meeste gevallen \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Gebruiker op andere server.'; $PALANG['pFetchmail_desc_src_password'] = 'Wachtwoord op andere server.'; diff --git a/languages/nn.lang b/languages/nn.lang index 570ce4b4..c2b69857 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -359,6 +359,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -378,6 +379,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/pl.lang b/languages/pl.lang index 57b0e614..47ce5590 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -365,6 +365,7 @@ $PALANG['pFetchmail_password_missing'] = 'Podaj hasło zdalnego użytkownika!'; $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Konto'; $PALANG['pFetchmail_field_src_server'] = 'Serwer'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Uwierzytelnianie'; $PALANG['pFetchmail_field_src_user'] = 'Użytkownik'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -384,6 +385,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Zwrócony tekst'; $PALANG['pFetchmail_desc_id'] = 'ID rekordu'; $PALANG['pFetchmail_desc_mailbox'] = 'Konto lokalne'; $PALANG['pFetchmail_desc_src_server'] = 'Zdalny serwer'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Najczęściej \'password\''; # Translators, do not translate 'password' here! $PALANG['pFetchmail_desc_src_user'] = 'Zdalny użytkownik'; $PALANG['pFetchmail_desc_src_password'] = 'Hasło zdalnego użytkownika'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index be862859..fc3b1b5f 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -372,6 +372,7 @@ $PALANG['pFetchmail_password_missing'] = 'Favor fornecer a senha da conta remota $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Conta'; $PALANG['pFetchmail_field_src_server'] = 'Servidor'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Autenticação'; $PALANG['pFetchmail_field_src_user'] = 'Usuário'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -391,6 +392,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Texto retornado'; $PALANG['pFetchmail_desc_id'] = 'ID do registro'; $PALANG['pFetchmail_desc_mailbox'] = 'Conta de email local'; $PALANG['pFetchmail_desc_src_server'] = 'Servidor remoto'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Quase sempre \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Usuário remoto'; $PALANG['pFetchmail_desc_src_password'] = 'Senha remota'; diff --git a/languages/ro.lang b/languages/ro.lang index b9afa670..8e48cf1a 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -370,6 +370,7 @@ $PALANG['pFetchmail_password_missing'] = 'Introduceti parola la distanta!'; $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Casuta de mail'; $PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Tip de autentificare'; $PALANG['pFetchmail_field_src_user'] = 'User'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -389,6 +390,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Text returnat'; $PALANG['pFetchmail_desc_id'] = 'Inregistrare ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Casuta email locala'; $PALANG['pFetchmail_desc_src_server'] = 'Server la distanta'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Utilizator la distanta'; $PALANG['pFetchmail_desc_src_password'] = 'Parola la distanta'; diff --git a/languages/ru.lang b/languages/ru.lang index 13a5c4ea..4b00fd75 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -372,6 +372,7 @@ $PALANG['pFetchmail_password_missing'] = 'Пожалуйста введите п $PALANG['pFetchmail_field_id'] = 'Номер'; $PALANG['pFetchmail_field_mailbox'] = 'Ящик'; $PALANG['pFetchmail_field_src_server'] = 'Сервер'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Тип аутентификации'; $PALANG['pFetchmail_field_src_user'] = 'Пользователь'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -391,6 +392,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Текст отчета'; $PALANG['pFetchmail_desc_id'] = 'Номер записи'; $PALANG['pFetchmail_desc_mailbox'] = 'Локальный ящик'; $PALANG['pFetchmail_desc_src_server'] = 'Удаленный сервер'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Обычно \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Удаленный пользователь'; $PALANG['pFetchmail_desc_src_password'] = 'Удаленный пароль'; diff --git a/languages/sk.lang b/languages/sk.lang index 0109e22d..9fdf38f3 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -360,6 +360,7 @@ $PALANG['pFetchmail_password_missing'] = 'Zadajte heslo vzdialeného používate $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Schránka'; $PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Autentifikácia'; $PALANG['pFetchmail_field_src_user'] = 'Meno'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -379,6 +380,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Výsledok'; $PALANG['pFetchmail_desc_id'] = 'ID záznamu'; $PALANG['pFetchmail_desc_mailbox'] = 'Lokálna schránka'; $PALANG['pFetchmail_desc_src_server'] = 'Vzdialený server'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Väčšinou \'password\''; # Translators: Please do NOT translate 'password' here $PALANG['pFetchmail_desc_src_user'] = 'Vzdialené meno používateľa'; $PALANG['pFetchmail_desc_src_password'] = 'Vzdialené heslo'; diff --git a/languages/sl.lang b/languages/sl.lang index 6a8f2061..38a32460 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -359,6 +359,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -378,6 +379,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/sv.lang b/languages/sv.lang index ada86d20..ee6cea15 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -371,6 +371,7 @@ $PALANG['pFetchmail_password_missing'] = 'Var snäll och fyll i lösenordet till $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'E-postkonto'; $PALANG['pFetchmail_field_src_server'] = 'Värddator'; +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Autentiseringstyp'; $PALANG['pFetchmail_field_src_user'] = 'Användarnamn'; $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -390,6 +391,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returtext'; $PALANG['pFetchmail_desc_id'] = 'Händelse-ID'; $PALANG['pFetchmail_desc_mailbox'] = 'Lokal brevlåda'; $PALANG['pFetchmail_desc_src_server'] = 'Värddator'; +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Oftast \'password\''; $PALANG['pFetchmail_desc_src_user'] = 'Användarnamn'; $PALANG['pFetchmail_desc_src_password'] = 'Lösenord'; diff --git a/languages/tr.lang b/languages/tr.lang index 88afbff5..a33eb395 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -359,6 +359,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -378,6 +379,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/languages/tw.lang b/languages/tw.lang index e246e461..ddcf3fd8 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -361,6 +361,7 @@ $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # $PALANG['pFetchmail_field_id'] = 'ID'; # XXX $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler @@ -380,6 +381,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX $PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX $PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX $PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX $PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX diff --git a/model/FetchmailHandler.php b/model/FetchmailHandler.php index 989d705d..82517cf9 100644 --- a/model/FetchmailHandler.php +++ b/model/FetchmailHandler.php @@ -25,6 +25,7 @@ class FetchmailHandler extends PFAHandler { 'domain' => pacol(0, 0, 1, 'text', '' , '' ), 'mailbox' => pacol(1, 1, 1, 'enum', 'pFetchmail_field_mailbox' , 'pFetchmail_desc_mailbox' ), # mailbox list 'src_server' => pacol(1, 1, 1, 'text', 'pFetchmail_field_src_server' , 'pFetchmail_desc_src_server' ), + 'src_port' => pacol(1, 1, 1, 'num', 'pFetchmail_field_src_port' , 'pFetchmail_desc_src_port' , 0 ), 'src_auth' => pacol(1, 1, 1, 'enum', 'pFetchmail_field_src_auth' , 'pFetchmail_desc_src_auth' , '', $src_auth_options), 'src_user' => pacol(1, 1, 1, 'text', 'pFetchmail_field_src_user' , 'pFetchmail_desc_src_user' ), 'src_password' => pacol(1, 1, 0, 'b64p', 'pFetchmail_field_src_password' , 'pFetchmail_desc_src_password' ), diff --git a/public/upgrade.php b/public/upgrade.php index 7e5cfe05..01848b92 100644 --- a/public/upgrade.php +++ b/public/upgrade.php @@ -1765,3 +1765,8 @@ function upgrade_1842() { _db_add_field('mailbox', 'password_expiry', "{DATETIME}"); // when a specific mailbox password expires _db_add_field('domain', 'password_expiry', 'int DEFAULT 0'); // expiry applied to mailboxes within that domain } + +function upgrade_1843() { + # Additional field for fetchmail to allow server with non-standard port number + _db_add_field('fetchmail', 'src_port', "{INT}", 'src_server'); +}