SF.net SVN: postfixadmin:[429] trunk
Brought to you by:
christian_boltz,
gingerdog
|
From: <chr...@us...> - 2008-07-29 23:18:35
|
Revision: 429
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=429&view=rev
Author: christian_boltz
Date: 2008-07-29 23:18:40 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
functions.inc.php:
- move DNS checks from check_email() to check_domain()
- add clear error message on non-resolvable domains (using flash_error() -
this is probably not the best solution, but better than nothing)
- made error messages translatable
create-domain.php:
- avoid duplicated call to check_domain (to avoid duplicated error message)
- domains are now DNS-checked on creation - see the changes in check_domain()
in functions.inc.php
languages/*:
- added error messages for the above changes
Modified Paths:
--------------
trunk/create-domain.php
trunk/functions.inc.php
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/create-domain.php 2008-07-29 23:18:40 UTC (rev 429)
@@ -76,8 +76,8 @@
if (isset ($_POST['fTransport'])) $tTransport = escape_string ($_POST['fTransport']);
if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = escape_string ($_POST['fDefaultaliases']);
if (isset ($_POST['fBackupmx'])) $tBackupmx = escape_string ($_POST['fBackupmx']);
+ /* if (empty ($fDomain) or !check_domain ($fDomain)) */ $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error'];
- if (empty ($fDomain) or !check_domain ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
}
if ($error != 1)
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/functions.inc.php 2008-07-29 23:18:40 UTC (rev 429)
@@ -227,14 +227,37 @@
// TODO: make check_domain able to handle as example .local domains
function check_domain ($domain)
{
- if (preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain)))
+ global $CONF;
+ global $PALANG;
+
+ if (!preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain)))
{
- return true;
+ flash_error(sprintf($PALANG['pInvalidDomainRegex'], htmlentities($domain)));
+ return false;
}
- else
+
+ if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7))))
{
- return false;
+
+ // Look for an AAAA, A, or MX record for the domain
+
+ if(function_exists('checkdnsrr')) {
+ // AAAA (IPv6) is only available in PHP v. >= 5
+ if (version_compare(phpversion(), "5.0.0", ">="))
+ {
+ if (checkdnsrr($domain,'AAAA')) return true;
+ }
+ if (checkdnsrr($domain,'A')) return true;
+ if (checkdnsrr($domain,'MX')) return true;
+ flash_error(sprintf($PALANG['pInvalidDomainDNS'], htmlentities($domain)));
+ return false;
+ }
+ else {
+ flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
+ }
}
+
+ return true;
}
@@ -260,47 +283,24 @@
$ce_email = preg_replace("/#/", '@', $ce_email);
}
- if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7))))
+ // Perform non-domain-part sanity checks
+ if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email)))
{
-
- // Perform non-domain-part sanity checks
- if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email)))
- {
- return false;
- }
-
- // Determine domain name
- $matches=array();
- if (!preg_match('|@(.+)$|',$ce_email,$matches))
- {
- return false;
- }
- $domain=$matches[1];
-
- // Look for an AAAA, A, or MX record for the domain
-
- if(function_exists('checkdnsrr')) {
- // AAAA (IPv6) is only available in PHP v. >= 5
- if (version_compare(phpversion(), "5.0.0", ">="))
- {
- if (checkdnsrr($domain,'AAAA')) return true;
- }
- if (checkdnsrr($domain,'A')) return true;
- if (checkdnsrr($domain,'MX')) return true;
- flash_error("Invalid domain, and/or not discoverable in DNS");
- return false;
- }
- else {
- flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
- }
+ flash_error($PALANG['pInvalidMailRegex']);
+ return false;
}
- if (preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($ce_email)))
+ // Determine domain name
+ $matches=array();
+ if (!preg_match('|@(.+)$|',$ce_email,$matches))
{
- return true;
+ flash_error($PALANG['pInvalidMailRegex']);
+ return false;
}
- flash_error("Invalid email address, fails regexp check");
- return false;
+ $domain=$matches[1];
+
+ # check domain name
+ return check_domain($domain);
}
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/bg.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/ca.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/cn.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/cs.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -386,6 +386,9 @@
$PALANG['pStatus_custom'] = 'Doručeno do ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Stahovat poštu pro:';
$PALANG['pFetchmail_new_entry'] = 'Nová položka';
$PALANG['pFetchmail_database_save_error'] = 'Tuto položku není možné uložit do databáze!';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/da.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -385,6 +385,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Hent post for:';
$PALANG['pFetchmail_new_entry'] = 'Ny regel';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/de.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -385,6 +385,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: ';
$PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/en.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -386,6 +386,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check";
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS";
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check";
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:';
$PALANG['pFetchmail_new_entry'] = 'New entry';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/es.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/et.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -378,6 +378,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/eu.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -373,6 +373,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/fi.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -376,6 +376,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/fo.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -379,6 +379,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/fr.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -376,6 +376,9 @@
$PALANG['pStatus_custom'] = 'Délivré à ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
$PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
$PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base!';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/hr.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -372,6 +372,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/hu.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -386,6 +386,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "A Jelszó túl rövid - legalább %s karakter szükséges";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Mail lehozása:';
$PALANG['pFetchmail_new_entry'] = 'Új bejegyzés';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/is.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -373,6 +373,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/it.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'In consegna a ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Password troppo breve - minimo %s caratteri";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Ricevi posta per:';
$PALANG['pFetchmail_new_entry'] = 'Nuova voce';
$PALANG['pFetchmail_database_save_error'] = 'Impossibile registrare nel database!';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/ja.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -384,6 +384,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "パスワードが短すぎます。最低 %s 文字必要です。"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'メール取得:';
$PALANG['pFetchmail_new_entry'] = '新しいエントリ';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/lt.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/mk.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/nb.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Leverer til ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Passordet er for kort - det må inneholde minst %s tegn";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Hent e-post for:';
$PALANG['pFetchmail_new_entry'] = 'Ny oppføring';
$PALANG['pFetchmail_database_save_error'] = 'Kunne ikke lagre denne oppføringen i databasen!';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/nl.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'Bezorgen op ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Haal mail op voor:';
$PALANG['pFetchmail_new_entry'] = 'Nieuw item';
$PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/nn.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -370,6 +370,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/pl.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -379,6 +379,9 @@
$PALANG['pStatus_custom'] = 'Dostarczyć do ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Hasło jest za krótkie - musi mieć minimum %s znaków";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Pobierz pocztę dla:';
$PALANG['pFetchmail_new_entry'] = 'Nowy wpis';
$PALANG['pFetchmail_database_save_error'] = 'Wpis nie może być zapisany w bazie danych!';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/pt-br.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/ru.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -386,6 +386,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Пароль слишком короткий - требуется %s символов";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Собирать почту для:';
$PALANG['pFetchmail_new_entry'] = 'Новая запись';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/sk.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/sl.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/sv.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -376,6 +376,9 @@
$PALANG['pStatus_custom'] = 'Levereras till ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "För kort lösenord - ett lösenord på %s tecken krävs";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Hämta mail för:';
$PALANG['pFetchmail_new_entry'] = 'Ny anteckning';
$PALANG['pFetchmail_database_save_error'] = 'Misslyckades med att spara anteckningen i databasen!';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/tr.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/tw.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|