From a7a43f6bee9db210145ae462ddeb13b3572aac9d Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Thu, 18 Oct 2012 06:17:29 +0000 Subject: [PATCH] fixing some bad engrish --- .gitattributes | 1 - bureau/admin/mail_properties.php | 160 ------------------- bureau/admin/piwik_addsites.php | 6 +- bureau/admin/quotas_oneuser.php | 2 +- bureau/admin/sql_doadd.php | 2 +- bureau/admin/sql_getparam.php | 2 +- bureau/class/m_bro.php | 2 +- bureau/locales/de_DE/LC_MESSAGES/messages.po | 114 +++---------- bureau/locales/en_US/LC_MESSAGES/messages.po | 104 ++---------- bureau/locales/es_ES/LC_MESSAGES/messages.po | 146 ++++++----------- bureau/locales/fr_FR/LC_MESSAGES/messages.po | 148 ++++++----------- bureau/locales/messages.pot | 104 ++---------- bureau/locales/pt_BR/LC_MESSAGES/messages.po | 136 +++++----------- lang/en_US.po | 86 +--------- 14 files changed, 202 insertions(+), 811 deletions(-) delete mode 100644 bureau/admin/mail_properties.php diff --git a/.gitattributes b/.gitattributes index 0a74b708..2c9e57dd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -289,7 +289,6 @@ bureau/admin/mail_doadd.php -text bureau/admin/mail_doedit.php -text bureau/admin/mail_edit.php -text bureau/admin/mail_list.php -text -bureau/admin/mail_properties.php -text bureau/admin/mail_undelete.php -text bureau/admin/main.php -text bureau/admin/mem_admin.php -text diff --git a/bureau/admin/mail_properties.php b/bureau/admin/mail_properties.php deleted file mode 100644 index 0f99bf54..00000000 --- a/bureau/admin/mail_properties.php +++ /dev/null @@ -1,160 +0,0 @@ - array ("request", "integer", ""), -); -getFields($fields); - -if ( ! $mail_id ) die("Error on mail_id"); - -$details = $mail->mail_get_details($mail_id); -if (!$details) die("Error on mail details"); -echo "

"; -echo sprintf(_("Edition of %s")."
",$details['address_full']); -echo "

";?> - -
-

- - - - - -list_properties($mail_id); -$prev_desc=""; -$lst_toggle=Array(); -$lst_advanced=Array(); -$first_advanced=true; -$col=1; -foreach ($properties as $k => $v ) { - $col=3-$col; - - if (isset($v['advanced']) && $v['advanced']) { - $lst_advanced[]=md5($v['short_desc']); - if ($first_advanced) { - $col=2; - $first_advanced=false; ?> - - - - - - - - "; - } - - echo " - - - -
-
- form($mail_id); ?> -
- - 
"; - echo "".$v['short_desc']."
"; - echo $v['human_desc']; -*/ - if ($v['short_desc'] != "$prev_desc" ) { - $prev_desc=$v['short_desc']; - $lst_toggle[]=md5($prev_desc); - echo "
- ".$v['short_desc']."
"; - if (!$ok) { - echo "
"; - __("Unavaible, you need to set a password before"); - echo ""; - } else { - $hooks->invoke('form', $v['form_param'], Array($v['class'])); -// $$v['class']->form($v['form_param']); - } - echo "
"; - ?> - - -
- - diff --git a/bureau/admin/piwik_addsites.php b/bureau/admin/piwik_addsites.php index 24dba52f..0d2ab486 100644 --- a/bureau/admin/piwik_addsites.php +++ b/bureau/admin/piwik_addsites.php @@ -39,11 +39,11 @@ getFields($fields); if(empty($site_name)) $site_name=$site_urls; if (empty($site_name)) { - $error=("Error : missing arguments."); + $error=("Error: missing arguments."); } elseif (! $piwik->site_add($site_name, $site_urls) ) { - $error=_("Error during adding website.
".$err->errstr()); + $error=_("Error while adding website.
".$err->errstr()); } else { - $error=_("Successfully add website"); + $error=_("Website added Successfully"); } include_once("piwik_sitelist.php"); diff --git a/bureau/admin/quotas_oneuser.php b/bureau/admin/quotas_oneuser.php index 48cbaa82..7dd07018 100644 --- a/bureau/admin/quotas_oneuser.php +++ b/bureau/admin/quotas_oneuser.php @@ -45,7 +45,7 @@ if (!isset($mode)) { # when included from adm_login, mode is not set $totalmail+=$mstmp; } - echo "

"._("Mail boxes:")." "; + echo "

"._("Mailboxes size:")." "; echo sprintf("%.1f", $totalmail / 1024)." "._("MB"); echo "

"; diff --git a/bureau/admin/sql_doadd.php b/bureau/admin/sql_doadd.php index f89a2536..8add2197 100644 --- a/bureau/admin/sql_doadd.php +++ b/bureau/admin/sql_doadd.php @@ -34,7 +34,7 @@ $fields = array ( ); getFields($fields); if (!$quota->cancreate("mysql")) { - $error=_("You "); + $error=_("Can't create a database: your quota is over"); include("sql_list.php"); exit; } diff --git a/bureau/admin/sql_getparam.php b/bureau/admin/sql_getparam.php index 7fd21fb7..ef2457fb 100644 --- a/bureau/admin/sql_getparam.php +++ b/bureau/admin/sql_getparam.php @@ -80,7 +80,7 @@ if(isset($r['user'])){ ";__("You changed the MySQL User base configuration. Please reffer to your configuration");echo"

 

"; + echo "

";__("You changed the MySQL User base configuration. Please refer to your configuration");echo"

 

"; } ?>

diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php index 97186a24..57c48fce 100644 --- a/bureau/class/m_bro.php +++ b/bureau/class/m_bro.php @@ -458,7 +458,7 @@ class m_bro { return false; } if ($old==$new) { - $err->raise("bro",_("You cannot move or copy a file to the same folder.")); + $err->raise("bro",_("You cannot move or copy a file to the same folder")); return false; } for ($i=0;$i\n" "Language-Team: Espagnol \n" @@ -153,8 +153,8 @@ msgstr "" #: ../admin/adm_add.php:71 ../admin/adm_edit.php:89 ../admin/ftp_add.php:77 #: ../admin/ftp_edit.php:70 ../admin/hta_adduser.php:62 #: ../admin/hta_edit.php:110 ../admin/hta_edituser.php:55 -#: ../admin/mail_edit.inc.php:67 ../admin/mail_edit.php:96 -#: ../admin/sql_users_add.php:67 ../admin/sql_users_password.php:59 +#: ../admin/mail_edit.php:96 ../admin/sql_users_add.php:67 +#: ../admin/sql_users_password.php:59 msgid "Confirm password" msgstr "" @@ -171,8 +171,7 @@ msgstr "" #: ../admin/bro_main.php:104 ../admin/dom_dodel.php:74 #: ../admin/dom_edit.php:193 ../admin/dom_edit.php:205 #: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90 -#: ../admin/mail_list.php:143 ../admin/mail_localbox_edit.inc.php:57 -#: ../admin/sql_bck.php:87 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:143 ../admin/sql_bck.php:87 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:39 #: ../class/m_bro.php:70 msgid "No" @@ -189,8 +188,7 @@ msgstr "Nein" #: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91 #: ../admin/mail_list.php:176 ../admin/mail_list.php:209 #: ../admin/mail_list.php:219 ../admin/mail_list.php:229 -#: ../admin/mail_list.php:239 ../admin/mail_localbox_edit.inc.php:58 -#: ../admin/sql_bck.php:88 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:239 ../admin/sql_bck.php:88 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:40 #: ../class/m_bro.php:70 msgid "Yes" @@ -235,9 +233,7 @@ msgstr "" #: ../admin/browseforfolder.php:146 ../admin/ftp_add.php:80 #: ../admin/ftp_del.php:83 ../admin/ftp_edit.php:74 #: ../admin/hta_adduser.php:68 ../admin/hta_dodeluser.php:65 -#: ../admin/mail_edit.inc.php:80 ../admin/mail_edit.php:115 -#: ../admin/mail_localbox_edit.inc.php:68 -#: ../admin/mail_redirection_edit.inc.php:65 ../admin/piwik_user_dodel.php:64 +#: ../admin/mail_edit.php:115 ../admin/piwik_user_dodel.php:64 #: ../admin/sql_bck.php:105 ../admin/sql_users_add.php:73 #: ../admin/sql_users_password.php:65 ../admin/sql_users_rights.php:101 msgid "Cancel" @@ -311,9 +307,8 @@ msgstr "" #: ../admin/adm_slaveip.php:87 ../admin/bro_main.php:278 ../admin/cron.php:54 #: ../admin/dom_edit.php:117 ../admin/ftp_del.php:82 #: ../admin/hta_dodeluser.php:64 ../admin/ip_main.php:74 -#: ../admin/ip_main.php:157 ../admin/mail_redirection_edit.inc.php:52 -#: ../admin/piwik_sitelist.php:74 ../admin/piwik_user_dodel.php:63 -#: ../admin/piwik_userlist.php:87 +#: ../admin/ip_main.php:157 ../admin/piwik_sitelist.php:74 +#: ../admin/piwik_user_dodel.php:63 ../admin/piwik_userlist.php:87 msgid "Delete" msgstr "" @@ -575,7 +570,6 @@ msgid "OK?" msgstr "" #: ../admin/adm_doms.php:69 ../admin/dom_edit.php:99 -#: ../admin/mail_edit.inc.php:37 msgid "Status" msgstr "" @@ -786,7 +780,6 @@ msgstr "" #: ../admin/adm_slaveaccount.php:100 ../admin/cron.php:39 #: ../admin/ftp_add.php:76 ../admin/ftp_edit.php:69 #: ../admin/hta_adduser.php:58 ../admin/hta_edit.php:106 ../admin/index.php:77 -#: ../admin/mail_edit.inc.php:45 ../admin/mail_edit.inc.php:63 #: ../admin/sql_getparam.php:71 ../admin/sql_users_add.php:63 #: ../admin/sql_users_list.php:48 ../admin/sql_users_password.php:55 msgid "Password" @@ -938,7 +931,6 @@ msgid "Expiry" msgstr "" #: ../admin/adm_list.php:176 ../admin/dom_edit.php:136 -#: ../admin/mail_edit.inc.php:41 msgid "Disable" msgstr "" @@ -1844,7 +1836,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: ../admin/dom_edit.php:143 ../admin/mail_edit.inc.php:42 +#: ../admin/dom_edit.php:143 msgid "Enable" msgstr "" @@ -2182,15 +2174,6 @@ msgstr "" msgid "Add %s mail to the domain %s" msgstr "" -#: ../admin/mail_alias_create.inc.php:52 -msgid "Create this alias" -msgstr "" - -#: ../admin/mail_alias_doedit.php:45 -#, php-format -msgid "Alias: %s already created" -msgstr "" - #: ../admin/mail_del.php:54 msgid "Deleting mail accounts" msgstr "" @@ -2217,41 +2200,6 @@ msgstr "" msgid "Your email has been edited successfully" msgstr "" -#: ../admin/mail_edit.inc.php:39 -msgid "" -"Is this mail enabled ?
Having a mail disabled forbid consultation or " -"reception, but do not remove the mailbox or his configuration." -msgstr "" - -#: ../admin/mail_edit.inc.php:47 -msgid "" -"You need to have a password for some application (example: local mailbox);" -msgstr "" - -#: ../admin/mail_edit.inc.php:52 -msgid "Set a passowrd:" -msgstr "" - -#: ../admin/mail_edit.inc.php:55 -msgid "Change your password:" -msgstr "" - -#: ../admin/mail_edit.inc.php:79 ../admin/mail_edit.php:114 -#: ../admin/mail_localbox_edit.inc.php:67 -#: ../admin/mail_redirection_edit.inc.php:64 -msgid "Change this email address" -msgstr "" - -#: ../admin/mail_edit.inc.php:95 -#, fuzzy -msgid "Password does not match" -msgstr "Miglied '%s' existiert nicht" - -#: ../admin/mail_edit.inc.php:99 -#, fuzzy -msgid "Password match" -msgstr "Passwört" - #: ../admin/mail_edit.php:53 #, php-format msgid "Editing the email %s" @@ -2338,6 +2286,10 @@ msgstr "" msgid "one recipient per line" msgstr "" +#: ../admin/mail_edit.php:114 +msgid "Change this email address" +msgstr "" + #: ../admin/mail_list.php:65 msgid "Create a new mail account" msgstr "" @@ -2511,33 +2463,11 @@ msgstr "" msgid "POP3S" msgstr "" -#: ../admin/mail_localbox_doedit.php:53 -msgid "Already Activated" -msgstr "" - -#: ../admin/mail_localbox_doedit.php:62 -msgid "Already disactivated" -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:42 ../admin/mail_properties.php:43 +#: ../admin/mail_properties.php:43 #, php-format msgid "Edition of %s" msgstr "" -#: ../admin/mail_localbox_edit.inc.php:50 -msgid "" -"WARNING: turning POP/IMAP off will DELETE the stored messages in this email " -"address. This email address will become a simple redirection." -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:52 -msgid "" -"Activate the localbox, will allow you to store your mails on this server. \n" -" It is a very conveniant way to check your mails while roaming,\n" -"\t\tthince they can be accesed remotely by POP or IMAP. It consume space on " -"the server so be sure to verify your quota attribution." -msgstr "" - #: ../admin/mail_properties.php:47 msgid "Select your action" msgstr "" @@ -2550,14 +2480,6 @@ msgstr "" msgid "Unavaible, you need to set a password before" msgstr "" -#: ../admin/mail_redirection_edit.inc.php:58 -msgid "Clear all redirections" -msgstr "" - -#: ../admin/mail_redirection_edit.inc.php:77 -msgid "Are you sure you want to clear all redirections?" -msgstr "" - #: ../admin/main.php:33 msgid "Last Login: " msgstr "" @@ -4102,6 +4024,14 @@ msgstr "" msgid "Real Media File" msgstr "" +#, fuzzy +#~ msgid "Password does not match" +#~ msgstr "Miglied '%s' existiert nicht" + +#, fuzzy +#~ msgid "Password match" +#~ msgstr "Passwört" + #, fuzzy #~ msgid "Password do not match" #~ msgstr "Passwört" diff --git a/bureau/locales/en_US/LC_MESSAGES/messages.po b/bureau/locales/en_US/LC_MESSAGES/messages.po index 4955199e..2bc32ebf 100644 --- a/bureau/locales/en_US/LC_MESSAGES/messages.po +++ b/bureau/locales/en_US/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: $Id: admin.po,v 1.10 2004/11/01 15:55:44 anonymous Exp " "$\n" "Report-Msgid-Bugs-To: i18n@alternc.org\n" -"POT-Creation-Date: 2012-10-17 10:09+0200\n" +"POT-Creation-Date: 2012-10-17 11:45+0200\n" "PO-Revision-Date: 2002-06-16 13:50CEST\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: French \n" @@ -149,8 +149,8 @@ msgstr "" #: ../admin/adm_add.php:71 ../admin/adm_edit.php:89 ../admin/ftp_add.php:77 #: ../admin/ftp_edit.php:70 ../admin/hta_adduser.php:62 #: ../admin/hta_edit.php:110 ../admin/hta_edituser.php:55 -#: ../admin/mail_edit.inc.php:67 ../admin/mail_edit.php:96 -#: ../admin/sql_users_add.php:67 ../admin/sql_users_password.php:59 +#: ../admin/mail_edit.php:96 ../admin/sql_users_add.php:67 +#: ../admin/sql_users_password.php:59 msgid "Confirm password" msgstr "" @@ -167,8 +167,7 @@ msgstr "" #: ../admin/bro_main.php:104 ../admin/dom_dodel.php:74 #: ../admin/dom_edit.php:193 ../admin/dom_edit.php:205 #: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90 -#: ../admin/mail_list.php:143 ../admin/mail_localbox_edit.inc.php:57 -#: ../admin/sql_bck.php:87 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:143 ../admin/sql_bck.php:87 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:39 #: ../class/m_bro.php:70 msgid "No" @@ -185,8 +184,7 @@ msgstr "" #: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91 #: ../admin/mail_list.php:176 ../admin/mail_list.php:209 #: ../admin/mail_list.php:219 ../admin/mail_list.php:229 -#: ../admin/mail_list.php:239 ../admin/mail_localbox_edit.inc.php:58 -#: ../admin/sql_bck.php:88 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:239 ../admin/sql_bck.php:88 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:40 #: ../class/m_bro.php:70 msgid "Yes" @@ -230,9 +228,7 @@ msgstr "" #: ../admin/browseforfolder.php:146 ../admin/ftp_add.php:80 #: ../admin/ftp_del.php:83 ../admin/ftp_edit.php:74 #: ../admin/hta_adduser.php:68 ../admin/hta_dodeluser.php:65 -#: ../admin/mail_edit.inc.php:80 ../admin/mail_edit.php:115 -#: ../admin/mail_localbox_edit.inc.php:68 -#: ../admin/mail_redirection_edit.inc.php:65 ../admin/piwik_user_dodel.php:64 +#: ../admin/mail_edit.php:115 ../admin/piwik_user_dodel.php:64 #: ../admin/sql_bck.php:105 ../admin/sql_users_add.php:73 #: ../admin/sql_users_password.php:65 ../admin/sql_users_rights.php:101 msgid "Cancel" @@ -306,9 +302,8 @@ msgstr "" #: ../admin/adm_slaveip.php:87 ../admin/bro_main.php:278 ../admin/cron.php:54 #: ../admin/dom_edit.php:117 ../admin/ftp_del.php:82 #: ../admin/hta_dodeluser.php:64 ../admin/ip_main.php:74 -#: ../admin/ip_main.php:157 ../admin/mail_redirection_edit.inc.php:52 -#: ../admin/piwik_sitelist.php:74 ../admin/piwik_user_dodel.php:63 -#: ../admin/piwik_userlist.php:87 +#: ../admin/ip_main.php:157 ../admin/piwik_sitelist.php:74 +#: ../admin/piwik_user_dodel.php:63 ../admin/piwik_userlist.php:87 msgid "Delete" msgstr "" @@ -569,7 +564,6 @@ msgid "OK?" msgstr "" #: ../admin/adm_doms.php:69 ../admin/dom_edit.php:99 -#: ../admin/mail_edit.inc.php:37 msgid "Status" msgstr "" @@ -783,7 +777,6 @@ msgstr "" #: ../admin/adm_slaveaccount.php:100 ../admin/cron.php:39 #: ../admin/ftp_add.php:76 ../admin/ftp_edit.php:69 #: ../admin/hta_adduser.php:58 ../admin/hta_edit.php:106 ../admin/index.php:77 -#: ../admin/mail_edit.inc.php:45 ../admin/mail_edit.inc.php:63 #: ../admin/sql_getparam.php:71 ../admin/sql_users_add.php:63 #: ../admin/sql_users_list.php:48 ../admin/sql_users_password.php:55 msgid "Password" @@ -935,7 +928,6 @@ msgid "Expiry" msgstr "" #: ../admin/adm_list.php:176 ../admin/dom_edit.php:136 -#: ../admin/mail_edit.inc.php:41 msgid "Disable" msgstr "" @@ -1835,7 +1827,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: ../admin/dom_edit.php:143 ../admin/mail_edit.inc.php:42 +#: ../admin/dom_edit.php:143 msgid "Enable" msgstr "" @@ -2176,15 +2168,6 @@ msgstr "" msgid "Add %s mail to the domain %s" msgstr "" -#: ../admin/mail_alias_create.inc.php:52 -msgid "Create this alias" -msgstr "" - -#: ../admin/mail_alias_doedit.php:45 -#, php-format -msgid "Alias: %s already created" -msgstr "" - #: ../admin/mail_del.php:54 msgid "Deleting mail accounts" msgstr "" @@ -2211,39 +2194,6 @@ msgstr "" msgid "Your email has been edited successfully" msgstr "" -#: ../admin/mail_edit.inc.php:39 -msgid "" -"Is this mail enabled ?
Having a mail disabled forbid consultation or " -"reception, but do not remove the mailbox or his configuration." -msgstr "" - -#: ../admin/mail_edit.inc.php:47 -msgid "" -"You need to have a password for some application (example: local mailbox);" -msgstr "" - -#: ../admin/mail_edit.inc.php:52 -msgid "Set a passowrd:" -msgstr "" - -#: ../admin/mail_edit.inc.php:55 -msgid "Change your password:" -msgstr "" - -#: ../admin/mail_edit.inc.php:79 ../admin/mail_edit.php:114 -#: ../admin/mail_localbox_edit.inc.php:67 -#: ../admin/mail_redirection_edit.inc.php:64 -msgid "Change this email address" -msgstr "" - -#: ../admin/mail_edit.inc.php:95 -msgid "Password does not match" -msgstr "" - -#: ../admin/mail_edit.inc.php:99 -msgid "Password match" -msgstr "" - #: ../admin/mail_edit.php:53 #, php-format msgid "Editing the email %s" @@ -2329,6 +2279,10 @@ msgstr "" msgid "one recipient per line" msgstr "" +#: ../admin/mail_edit.php:114 +msgid "Change this email address" +msgstr "" + #: ../admin/mail_list.php:65 msgid "Create a new mail account" msgstr "" @@ -2500,33 +2454,11 @@ msgstr "" msgid "POP3S" msgstr "" -#: ../admin/mail_localbox_doedit.php:53 -msgid "Already Activated" -msgstr "" - -#: ../admin/mail_localbox_doedit.php:62 -msgid "Already disactivated" -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:42 ../admin/mail_properties.php:43 +#: ../admin/mail_properties.php:43 #, php-format msgid "Edition of %s" msgstr "" -#: ../admin/mail_localbox_edit.inc.php:50 -msgid "" -"WARNING: turning POP/IMAP off will DELETE the stored messages in this email " -"address. This email address will become a simple redirection." -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:52 -msgid "" -"Activate the localbox, will allow you to store your mails on this server. \n" -" It is a very conveniant way to check your mails while roaming,\n" -"\t\tthince they can be accesed remotely by POP or IMAP. It consume space on " -"the server so be sure to verify your quota attribution." -msgstr "" - #: ../admin/mail_properties.php:47 msgid "Select your action" msgstr "" @@ -2539,14 +2471,6 @@ msgstr "" msgid "Unavaible, you need to set a password before" msgstr "" -#: ../admin/mail_redirection_edit.inc.php:58 -msgid "Clear all redirections" -msgstr "" - -#: ../admin/mail_redirection_edit.inc.php:77 -msgid "Are you sure you want to clear all redirections?" -msgstr "" - #: ../admin/main.php:33 msgid "Last Login: " msgstr "" diff --git a/bureau/locales/es_ES/LC_MESSAGES/messages.po b/bureau/locales/es_ES/LC_MESSAGES/messages.po index a23719e7..97eaf993 100644 --- a/bureau/locales/es_ES/LC_MESSAGES/messages.po +++ b/bureau/locales/es_ES/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: i18n@alternc.org\n" -"POT-Creation-Date: 2012-10-17 10:09+0200\n" +"POT-Creation-Date: 2012-10-17 11:45+0200\n" "PO-Revision-Date: 2008-09-05 16:50+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -169,8 +169,8 @@ msgstr "Contraseña inicial" #: ../admin/adm_add.php:71 ../admin/adm_edit.php:89 ../admin/ftp_add.php:77 #: ../admin/ftp_edit.php:70 ../admin/hta_adduser.php:62 #: ../admin/hta_edit.php:110 ../admin/hta_edituser.php:55 -#: ../admin/mail_edit.inc.php:67 ../admin/mail_edit.php:96 -#: ../admin/sql_users_add.php:67 ../admin/sql_users_password.php:59 +#: ../admin/mail_edit.php:96 ../admin/sql_users_add.php:67 +#: ../admin/sql_users_password.php:59 msgid "Confirm password" msgstr "Confirmar contraseña" @@ -187,8 +187,7 @@ msgstr "¿Puede cambiar su contraseña?" #: ../admin/bro_main.php:104 ../admin/dom_dodel.php:74 #: ../admin/dom_edit.php:193 ../admin/dom_edit.php:205 #: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90 -#: ../admin/mail_list.php:143 ../admin/mail_localbox_edit.inc.php:57 -#: ../admin/sql_bck.php:87 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:143 ../admin/sql_bck.php:87 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:39 #: ../class/m_bro.php:70 msgid "No" @@ -205,8 +204,7 @@ msgstr "No" #: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91 #: ../admin/mail_list.php:176 ../admin/mail_list.php:209 #: ../admin/mail_list.php:219 ../admin/mail_list.php:229 -#: ../admin/mail_list.php:239 ../admin/mail_localbox_edit.inc.php:58 -#: ../admin/sql_bck.php:88 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:239 ../admin/sql_bck.php:88 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:40 #: ../class/m_bro.php:70 msgid "Yes" @@ -252,9 +250,7 @@ msgstr "Crear la cuenta FTP." #: ../admin/browseforfolder.php:146 ../admin/ftp_add.php:80 #: ../admin/ftp_del.php:83 ../admin/ftp_edit.php:74 #: ../admin/hta_adduser.php:68 ../admin/hta_dodeluser.php:65 -#: ../admin/mail_edit.inc.php:80 ../admin/mail_edit.php:115 -#: ../admin/mail_localbox_edit.inc.php:68 -#: ../admin/mail_redirection_edit.inc.php:65 ../admin/piwik_user_dodel.php:64 +#: ../admin/mail_edit.php:115 ../admin/piwik_user_dodel.php:64 #: ../admin/sql_bck.php:105 ../admin/sql_users_add.php:73 #: ../admin/sql_users_password.php:65 ../admin/sql_users_rights.php:101 msgid "Cancel" @@ -331,9 +327,8 @@ msgstr "Modificar" #: ../admin/adm_slaveip.php:87 ../admin/bro_main.php:278 ../admin/cron.php:54 #: ../admin/dom_edit.php:117 ../admin/ftp_del.php:82 #: ../admin/hta_dodeluser.php:64 ../admin/ip_main.php:74 -#: ../admin/ip_main.php:157 ../admin/mail_redirection_edit.inc.php:52 -#: ../admin/piwik_sitelist.php:74 ../admin/piwik_user_dodel.php:63 -#: ../admin/piwik_userlist.php:87 +#: ../admin/ip_main.php:157 ../admin/piwik_sitelist.php:74 +#: ../admin/piwik_user_dodel.php:63 ../admin/piwik_userlist.php:87 msgid "Delete" msgstr "Borrar" @@ -613,7 +608,6 @@ msgid "OK?" msgstr "OK" #: ../admin/adm_doms.php:69 ../admin/dom_edit.php:99 -#: ../admin/mail_edit.inc.php:37 msgid "Status" msgstr "" @@ -837,7 +831,6 @@ msgstr "No estás autorizado a cambiar tu contraseña" #: ../admin/adm_slaveaccount.php:100 ../admin/cron.php:39 #: ../admin/ftp_add.php:76 ../admin/ftp_edit.php:69 #: ../admin/hta_adduser.php:58 ../admin/hta_edit.php:106 ../admin/index.php:77 -#: ../admin/mail_edit.inc.php:45 ../admin/mail_edit.inc.php:63 #: ../admin/sql_getparam.php:71 ../admin/sql_users_add.php:63 #: ../admin/sql_users_list.php:48 ../admin/sql_users_password.php:55 msgid "Password" @@ -1001,7 +994,6 @@ msgid "Expiry" msgstr "Expiración" #: ../admin/adm_list.php:176 ../admin/dom_edit.php:136 -#: ../admin/mail_edit.inc.php:41 msgid "Disable" msgstr "" @@ -1977,7 +1969,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: ../admin/dom_edit.php:143 ../admin/mail_edit.inc.php:42 +#: ../admin/dom_edit.php:143 msgid "Enable" msgstr "" @@ -2343,16 +2335,6 @@ msgstr "Bajar" msgid "Add %s mail to the domain %s" msgstr "Añadir una cuenta de correo para el dominio %s" -#: ../admin/mail_alias_create.inc.php:52 -#, fuzzy -msgid "Create this alias" -msgstr "Crear" - -#: ../admin/mail_alias_doedit.php:45 -#, php-format -msgid "Alias: %s already created" -msgstr "" - #: ../admin/mail_del.php:54 msgid "Deleting mail accounts" msgstr "Supresión de buzones de correo" @@ -2382,44 +2364,6 @@ msgstr "" msgid "Your email has been edited successfully" msgstr "Tu nuevo dominio %s fue instalado con éxito" -#: ../admin/mail_edit.inc.php:39 -msgid "" -"Is this mail enabled ?
Having a mail disabled forbid consultation or " -"reception, but do not remove the mailbox or his configuration." -msgstr "" - -#: ../admin/mail_edit.inc.php:47 -msgid "" -"You need to have a password for some application (example: local mailbox);" -msgstr "" - -#: ../admin/mail_edit.inc.php:52 -#, fuzzy -msgid "Set a passowrd:" -msgstr "Nueva contraseña" - -#: ../admin/mail_edit.inc.php:55 -#, fuzzy -msgid "Change your password:" -msgstr "Modificar contraseña" - -#: ../admin/mail_edit.inc.php:79 ../admin/mail_edit.php:114 -#: ../admin/mail_localbox_edit.inc.php:67 -#: ../admin/mail_redirection_edit.inc.php:64 -#, fuzzy -msgid "Change this email address" -msgstr "Modificar este buzón" - -#: ../admin/mail_edit.inc.php:95 -#, fuzzy -msgid "Password does not match" -msgstr "Las contraseñas no corresponden" - -#: ../admin/mail_edit.inc.php:99 -#, fuzzy -msgid "Password match" -msgstr "Las contraseñas no corresponden" - #: ../admin/mail_edit.php:53 #, fuzzy, php-format msgid "Editing the email %s" @@ -2510,6 +2454,11 @@ msgstr "" msgid "one recipient per line" msgstr "una cuenta de correo por línea" +#: ../admin/mail_edit.php:114 +#, fuzzy +msgid "Change this email address" +msgstr "Modificar este buzón" + #: ../admin/mail_list.php:65 #, fuzzy msgid "Create a new mail account" @@ -2696,35 +2645,11 @@ msgstr "" msgid "POP3S" msgstr "" -#: ../admin/mail_localbox_doedit.php:53 -#, fuzzy -msgid "Already Activated" -msgstr "Desactivar" - -#: ../admin/mail_localbox_doedit.php:62 -#, fuzzy -msgid "Already disactivated" -msgstr "Desactivar" - -#: ../admin/mail_localbox_edit.inc.php:42 ../admin/mail_properties.php:43 +#: ../admin/mail_properties.php:43 #, fuzzy, php-format msgid "Edition of %s" msgstr "Añadir un buzón en %s" -#: ../admin/mail_localbox_edit.inc.php:50 -msgid "" -"WARNING: turning POP/IMAP off will DELETE the stored messages in this email " -"address. This email address will become a simple redirection." -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:52 -msgid "" -"Activate the localbox, will allow you to store your mails on this server. \n" -" It is a very conveniant way to check your mails while roaming,\n" -"\t\tthince they can be accesed remotely by POP or IMAP. It consume space on " -"the server so be sure to verify your quota attribution." -msgstr "" - #: ../admin/mail_properties.php:47 #, fuzzy msgid "Select your action" @@ -2738,15 +2663,6 @@ msgstr "" msgid "Unavaible, you need to set a password before" msgstr "" -#: ../admin/mail_redirection_edit.inc.php:58 -#, fuzzy -msgid "Clear all redirections" -msgstr "Dirigir hacia una dirección IP" - -#: ../admin/mail_redirection_edit.inc.php:77 -msgid "Are you sure you want to clear all redirections?" -msgstr "" - #: ../admin/main.php:33 msgid "Last Login: " msgstr "Última conexión: " @@ -4384,6 +4300,38 @@ msgstr "Animación Flash" msgid "Real Media File" msgstr "Archivo Real Media" +#, fuzzy +#~ msgid "Create this alias" +#~ msgstr "Crear" + +#, fuzzy +#~ msgid "Set a passowrd:" +#~ msgstr "Nueva contraseña" + +#, fuzzy +#~ msgid "Change your password:" +#~ msgstr "Modificar contraseña" + +#, fuzzy +#~ msgid "Password does not match" +#~ msgstr "Las contraseñas no corresponden" + +#, fuzzy +#~ msgid "Password match" +#~ msgstr "Las contraseñas no corresponden" + +#, fuzzy +#~ msgid "Already Activated" +#~ msgstr "Desactivar" + +#, fuzzy +#~ msgid "Already disactivated" +#~ msgstr "Desactivar" + +#, fuzzy +#~ msgid "Clear all redirections" +#~ msgstr "Dirigir hacia una dirección IP" + #, fuzzy #~ msgid "This allow you to change your mail password." #~ msgstr "No estás autorizado a cambiar tu contraseña" diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po index db0acb8a..b8f703de 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po +++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: $Id: admin.po,v 1.10 2004/11/01 15:55:44 anonymous Exp " "$\n" "Report-Msgid-Bugs-To: i18n@alternc.org\n" -"POT-Creation-Date: 2012-10-17 10:09+0200\n" +"POT-Creation-Date: 2012-10-17 11:45+0200\n" "PO-Revision-Date: 2012-10-17 09:52+0200\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: français \n" @@ -167,8 +167,8 @@ msgstr "Mot de passe initial" #: ../admin/adm_add.php:71 ../admin/adm_edit.php:89 ../admin/ftp_add.php:77 #: ../admin/ftp_edit.php:70 ../admin/hta_adduser.php:62 #: ../admin/hta_edit.php:110 ../admin/hta_edituser.php:55 -#: ../admin/mail_edit.inc.php:67 ../admin/mail_edit.php:96 -#: ../admin/sql_users_add.php:67 ../admin/sql_users_password.php:59 +#: ../admin/mail_edit.php:96 ../admin/sql_users_add.php:67 +#: ../admin/sql_users_password.php:59 msgid "Confirm password" msgstr "Confirmer le mot de passe" @@ -185,8 +185,7 @@ msgstr "Peut-il changer son mot de passe ?" #: ../admin/bro_main.php:104 ../admin/dom_dodel.php:74 #: ../admin/dom_edit.php:193 ../admin/dom_edit.php:205 #: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90 -#: ../admin/mail_list.php:143 ../admin/mail_localbox_edit.inc.php:57 -#: ../admin/sql_bck.php:87 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:143 ../admin/sql_bck.php:87 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:39 #: ../class/m_bro.php:70 msgid "No" @@ -203,8 +202,7 @@ msgstr "Non" #: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91 #: ../admin/mail_list.php:176 ../admin/mail_list.php:209 #: ../admin/mail_list.php:219 ../admin/mail_list.php:229 -#: ../admin/mail_list.php:239 ../admin/mail_localbox_edit.inc.php:58 -#: ../admin/sql_bck.php:88 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:239 ../admin/sql_bck.php:88 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:40 #: ../class/m_bro.php:70 msgid "Yes" @@ -248,9 +246,7 @@ msgstr "Créer ce compte AlternC" #: ../admin/browseforfolder.php:146 ../admin/ftp_add.php:80 #: ../admin/ftp_del.php:83 ../admin/ftp_edit.php:74 #: ../admin/hta_adduser.php:68 ../admin/hta_dodeluser.php:65 -#: ../admin/mail_edit.inc.php:80 ../admin/mail_edit.php:115 -#: ../admin/mail_localbox_edit.inc.php:68 -#: ../admin/mail_redirection_edit.inc.php:65 ../admin/piwik_user_dodel.php:64 +#: ../admin/mail_edit.php:115 ../admin/piwik_user_dodel.php:64 #: ../admin/sql_bck.php:105 ../admin/sql_users_add.php:73 #: ../admin/sql_users_password.php:65 ../admin/sql_users_rights.php:101 msgid "Cancel" @@ -328,9 +324,8 @@ msgstr "Modifier" #: ../admin/adm_slaveip.php:87 ../admin/bro_main.php:278 ../admin/cron.php:54 #: ../admin/dom_edit.php:117 ../admin/ftp_del.php:82 #: ../admin/hta_dodeluser.php:64 ../admin/ip_main.php:74 -#: ../admin/ip_main.php:157 ../admin/mail_redirection_edit.inc.php:52 -#: ../admin/piwik_sitelist.php:74 ../admin/piwik_user_dodel.php:63 -#: ../admin/piwik_userlist.php:87 +#: ../admin/ip_main.php:157 ../admin/piwik_sitelist.php:74 +#: ../admin/piwik_user_dodel.php:63 ../admin/piwik_userlist.php:87 msgid "Delete" msgstr "Effacer" @@ -613,7 +608,6 @@ msgid "OK?" msgstr "OK ?" #: ../admin/adm_doms.php:69 ../admin/dom_edit.php:99 -#: ../admin/mail_edit.inc.php:37 msgid "Status" msgstr "État" @@ -829,7 +823,6 @@ msgstr "Vous ne pouvez pas désactiver votre propre compte !" #: ../admin/adm_slaveaccount.php:100 ../admin/cron.php:39 #: ../admin/ftp_add.php:76 ../admin/ftp_edit.php:69 #: ../admin/hta_adduser.php:58 ../admin/hta_edit.php:106 ../admin/index.php:77 -#: ../admin/mail_edit.inc.php:45 ../admin/mail_edit.inc.php:63 #: ../admin/sql_getparam.php:71 ../admin/sql_users_add.php:63 #: ../admin/sql_users_list.php:48 ../admin/sql_users_password.php:55 msgid "Password" @@ -983,7 +976,6 @@ msgid "Expiry" msgstr "Expiration" #: ../admin/adm_list.php:176 ../admin/dom_edit.php:136 -#: ../admin/mail_edit.inc.php:41 msgid "Disable" msgstr "Désactiver" @@ -1934,7 +1926,7 @@ msgstr "Activation en cours" msgid "Disabled" msgstr "Désactivé" -#: ../admin/dom_edit.php:143 ../admin/mail_edit.inc.php:42 +#: ../admin/dom_edit.php:143 msgid "Enable" msgstr "Activer" @@ -2297,16 +2289,6 @@ msgstr "Télécharger" msgid "Add %s mail to the domain %s" msgstr "Ajout d'un mail sur le domaine %s" -#: ../admin/mail_alias_create.inc.php:52 -#, fuzzy -msgid "Create this alias" -msgstr "Créer un alias" - -#: ../admin/mail_alias_doedit.php:45 -#, php-format -msgid "Alias: %s already created" -msgstr "" - #: ../admin/mail_del.php:54 msgid "Deleting mail accounts" msgstr "Suppression des adresses email" @@ -2337,40 +2319,6 @@ msgstr "" msgid "Your email has been edited successfully" msgstr "Votre nouveau domaine %s a été installé avec succès" -#: ../admin/mail_edit.inc.php:39 -msgid "" -"Is this mail enabled ?
Having a mail disabled forbid consultation or " -"reception, but do not remove the mailbox or his configuration." -msgstr "" - -#: ../admin/mail_edit.inc.php:47 -msgid "" -"You need to have a password for some application (example: local mailbox);" -msgstr "" - -#: ../admin/mail_edit.inc.php:52 -#, fuzzy -msgid "Set a passowrd:" -msgstr "Nouveau mot de passe" - -#: ../admin/mail_edit.inc.php:55 -msgid "Change your password:" -msgstr "Modifier votre mot de passe :" - -#: ../admin/mail_edit.inc.php:79 ../admin/mail_edit.php:114 -#: ../admin/mail_localbox_edit.inc.php:67 -#: ../admin/mail_redirection_edit.inc.php:64 -msgid "Change this email address" -msgstr "Modifier cette adresse email" - -#: ../admin/mail_edit.inc.php:95 -msgid "Password does not match" -msgstr "Les mots de passe ne correspondent pas" - -#: ../admin/mail_edit.inc.php:99 -msgid "Password match" -msgstr "Les mots de passe correspondent" - #: ../admin/mail_edit.php:53 #, fuzzy, php-format msgid "Editing the email %s" @@ -2462,6 +2410,10 @@ msgstr "" msgid "one recipient per line" msgstr "une adresse email par ligne" +#: ../admin/mail_edit.php:114 +msgid "Change this email address" +msgstr "Modifier cette adresse email" + #: ../admin/mail_list.php:65 #, fuzzy msgid "Create a new mail account" @@ -2644,37 +2596,11 @@ msgstr "" msgid "POP3S" msgstr "" -#: ../admin/mail_localbox_doedit.php:53 -#, fuzzy -msgid "Already Activated" -msgstr "Désactiver" - -#: ../admin/mail_localbox_doedit.php:62 -#, fuzzy -msgid "Already disactivated" -msgstr "Désactiver" - -#: ../admin/mail_localbox_edit.inc.php:42 ../admin/mail_properties.php:43 +#: ../admin/mail_properties.php:43 #, fuzzy, php-format msgid "Edition of %s" msgstr "Ajouter une adresse email sur %s" -#: ../admin/mail_localbox_edit.inc.php:50 -msgid "" -"WARNING: turning POP/IMAP off will DELETE the stored messages in this email " -"address. This email address will become a simple redirection." -msgstr "" -"ATTENTION : Choisir 'Non' ici supprimera les messages stockés dans " -"cette adresse email. L'adresse email sera transformée en simple redirection." - -#: ../admin/mail_localbox_edit.inc.php:52 -msgid "" -"Activate the localbox, will allow you to store your mails on this server. \n" -" It is a very conveniant way to check your mails while roaming,\n" -"\t\tthince they can be accesed remotely by POP or IMAP. It consume space on " -"the server so be sure to verify your quota attribution." -msgstr "" - #: ../admin/mail_properties.php:47 #, fuzzy msgid "Select your action" @@ -2689,15 +2615,6 @@ msgstr "Global" msgid "Unavaible, you need to set a password before" msgstr "" -#: ../admin/mail_redirection_edit.inc.php:58 -#, fuzzy -msgid "Clear all redirections" -msgstr "Redirection vers l'URL : " - -#: ../admin/mail_redirection_edit.inc.php:77 -msgid "Are you sure you want to clear all redirections?" -msgstr "" - #: ../admin/main.php:33 msgid "Last Login: " msgstr "Dernière connexion : " @@ -4327,6 +4244,43 @@ msgstr "Animation Flash" msgid "Real Media File" msgstr "Fichier Real Media" +#, fuzzy +#~ msgid "Create this alias" +#~ msgstr "Créer un alias" + +#, fuzzy +#~ msgid "Set a passowrd:" +#~ msgstr "Nouveau mot de passe" + +#~ msgid "Change your password:" +#~ msgstr "Modifier votre mot de passe :" + +#~ msgid "Password does not match" +#~ msgstr "Les mots de passe ne correspondent pas" + +#~ msgid "Password match" +#~ msgstr "Les mots de passe correspondent" + +#, fuzzy +#~ msgid "Already Activated" +#~ msgstr "Désactiver" + +#, fuzzy +#~ msgid "Already disactivated" +#~ msgstr "Désactiver" + +#~ msgid "" +#~ "WARNING: turning POP/IMAP off will DELETE the stored messages in this " +#~ "email address. This email address will become a simple redirection." +#~ msgstr "" +#~ "ATTENTION : Choisir 'Non' ici supprimera les messages stockés dans " +#~ "cette adresse email. L'adresse email sera transformée en simple " +#~ "redirection." + +#, fuzzy +#~ msgid "Clear all redirections" +#~ msgstr "Redirection vers l'URL : " + #~ msgid "" #~ "This password is not strong enough for your policy, set a stronger " #~ "password or call your administrator" diff --git a/bureau/locales/messages.pot b/bureau/locales/messages.pot index cb341a15..de814e0a 100644 --- a/bureau/locales/messages.pot +++ b/bureau/locales/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: AlternC 2.0\n" "Report-Msgid-Bugs-To: i18n@alternc.org\n" -"POT-Creation-Date: 2012-10-17 10:09+0200\n" +"POT-Creation-Date: 2012-10-17 11:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -149,8 +149,8 @@ msgstr "" #: ../admin/adm_add.php:71 ../admin/adm_edit.php:89 ../admin/ftp_add.php:77 #: ../admin/ftp_edit.php:70 ../admin/hta_adduser.php:62 #: ../admin/hta_edit.php:110 ../admin/hta_edituser.php:55 -#: ../admin/mail_edit.inc.php:67 ../admin/mail_edit.php:96 -#: ../admin/sql_users_add.php:67 ../admin/sql_users_password.php:59 +#: ../admin/mail_edit.php:96 ../admin/sql_users_add.php:67 +#: ../admin/sql_users_password.php:59 msgid "Confirm password" msgstr "" @@ -167,8 +167,7 @@ msgstr "" #: ../admin/bro_main.php:104 ../admin/dom_dodel.php:74 #: ../admin/dom_edit.php:193 ../admin/dom_edit.php:205 #: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90 -#: ../admin/mail_list.php:143 ../admin/mail_localbox_edit.inc.php:57 -#: ../admin/sql_bck.php:87 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:143 ../admin/sql_bck.php:87 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:39 #: ../class/m_bro.php:70 msgid "No" @@ -185,8 +184,7 @@ msgstr "" #: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91 #: ../admin/mail_list.php:176 ../admin/mail_list.php:209 #: ../admin/mail_list.php:219 ../admin/mail_list.php:229 -#: ../admin/mail_list.php:239 ../admin/mail_localbox_edit.inc.php:58 -#: ../admin/sql_bck.php:88 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:239 ../admin/sql_bck.php:88 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:40 #: ../class/m_bro.php:70 msgid "Yes" @@ -230,9 +228,7 @@ msgstr "" #: ../admin/browseforfolder.php:146 ../admin/ftp_add.php:80 #: ../admin/ftp_del.php:83 ../admin/ftp_edit.php:74 #: ../admin/hta_adduser.php:68 ../admin/hta_dodeluser.php:65 -#: ../admin/mail_edit.inc.php:80 ../admin/mail_edit.php:115 -#: ../admin/mail_localbox_edit.inc.php:68 -#: ../admin/mail_redirection_edit.inc.php:65 ../admin/piwik_user_dodel.php:64 +#: ../admin/mail_edit.php:115 ../admin/piwik_user_dodel.php:64 #: ../admin/sql_bck.php:105 ../admin/sql_users_add.php:73 #: ../admin/sql_users_password.php:65 ../admin/sql_users_rights.php:101 msgid "Cancel" @@ -306,9 +302,8 @@ msgstr "" #: ../admin/adm_slaveip.php:87 ../admin/bro_main.php:278 ../admin/cron.php:54 #: ../admin/dom_edit.php:117 ../admin/ftp_del.php:82 #: ../admin/hta_dodeluser.php:64 ../admin/ip_main.php:74 -#: ../admin/ip_main.php:157 ../admin/mail_redirection_edit.inc.php:52 -#: ../admin/piwik_sitelist.php:74 ../admin/piwik_user_dodel.php:63 -#: ../admin/piwik_userlist.php:87 +#: ../admin/ip_main.php:157 ../admin/piwik_sitelist.php:74 +#: ../admin/piwik_user_dodel.php:63 ../admin/piwik_userlist.php:87 msgid "Delete" msgstr "" @@ -569,7 +564,6 @@ msgid "OK?" msgstr "" #: ../admin/adm_doms.php:69 ../admin/dom_edit.php:99 -#: ../admin/mail_edit.inc.php:37 msgid "Status" msgstr "" @@ -779,7 +773,6 @@ msgstr "" #: ../admin/adm_slaveaccount.php:100 ../admin/cron.php:39 #: ../admin/ftp_add.php:76 ../admin/ftp_edit.php:69 #: ../admin/hta_adduser.php:58 ../admin/hta_edit.php:106 ../admin/index.php:77 -#: ../admin/mail_edit.inc.php:45 ../admin/mail_edit.inc.php:63 #: ../admin/sql_getparam.php:71 ../admin/sql_users_add.php:63 #: ../admin/sql_users_list.php:48 ../admin/sql_users_password.php:55 msgid "Password" @@ -931,7 +924,6 @@ msgid "Expiry" msgstr "" #: ../admin/adm_list.php:176 ../admin/dom_edit.php:136 -#: ../admin/mail_edit.inc.php:41 msgid "Disable" msgstr "" @@ -1831,7 +1823,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: ../admin/dom_edit.php:143 ../admin/mail_edit.inc.php:42 +#: ../admin/dom_edit.php:143 msgid "Enable" msgstr "" @@ -2169,15 +2161,6 @@ msgstr "" msgid "Add %s mail to the domain %s" msgstr "" -#: ../admin/mail_alias_create.inc.php:52 -msgid "Create this alias" -msgstr "" - -#: ../admin/mail_alias_doedit.php:45 -#, php-format -msgid "Alias: %s already created" -msgstr "" - #: ../admin/mail_del.php:54 msgid "Deleting mail accounts" msgstr "" @@ -2204,39 +2187,6 @@ msgstr "" msgid "Your email has been edited successfully" msgstr "" -#: ../admin/mail_edit.inc.php:39 -msgid "" -"Is this mail enabled ?
Having a mail disabled forbid consultation or " -"reception, but do not remove the mailbox or his configuration." -msgstr "" - -#: ../admin/mail_edit.inc.php:47 -msgid "" -"You need to have a password for some application (example: local mailbox);" -msgstr "" - -#: ../admin/mail_edit.inc.php:52 -msgid "Set a passowrd:" -msgstr "" - -#: ../admin/mail_edit.inc.php:55 -msgid "Change your password:" -msgstr "" - -#: ../admin/mail_edit.inc.php:79 ../admin/mail_edit.php:114 -#: ../admin/mail_localbox_edit.inc.php:67 -#: ../admin/mail_redirection_edit.inc.php:64 -msgid "Change this email address" -msgstr "" - -#: ../admin/mail_edit.inc.php:95 -msgid "Password does not match" -msgstr "" - -#: ../admin/mail_edit.inc.php:99 -msgid "Password match" -msgstr "" - #: ../admin/mail_edit.php:53 #, php-format msgid "Editing the email %s" @@ -2322,6 +2272,10 @@ msgstr "" msgid "one recipient per line" msgstr "" +#: ../admin/mail_edit.php:114 +msgid "Change this email address" +msgstr "" + #: ../admin/mail_list.php:65 msgid "Create a new mail account" msgstr "" @@ -2493,33 +2447,11 @@ msgstr "" msgid "POP3S" msgstr "" -#: ../admin/mail_localbox_doedit.php:53 -msgid "Already Activated" -msgstr "" - -#: ../admin/mail_localbox_doedit.php:62 -msgid "Already disactivated" -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:42 ../admin/mail_properties.php:43 +#: ../admin/mail_properties.php:43 #, php-format msgid "Edition of %s" msgstr "" -#: ../admin/mail_localbox_edit.inc.php:50 -msgid "" -"WARNING: turning POP/IMAP off will DELETE the stored messages in this email " -"address. This email address will become a simple redirection." -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:52 -msgid "" -"Activate the localbox, will allow you to store your mails on this server. \n" -" It is a very conveniant way to check your mails while roaming,\n" -"\t\tthince they can be accesed remotely by POP or IMAP. It consume space on " -"the server so be sure to verify your quota attribution." -msgstr "" - #: ../admin/mail_properties.php:47 msgid "Select your action" msgstr "" @@ -2532,14 +2464,6 @@ msgstr "" msgid "Unavaible, you need to set a password before" msgstr "" -#: ../admin/mail_redirection_edit.inc.php:58 -msgid "Clear all redirections" -msgstr "" - -#: ../admin/mail_redirection_edit.inc.php:77 -msgid "Are you sure you want to clear all redirections?" -msgstr "" - #: ../admin/main.php:33 msgid "Last Login: " msgstr "" diff --git a/bureau/locales/pt_BR/LC_MESSAGES/messages.po b/bureau/locales/pt_BR/LC_MESSAGES/messages.po index 8de5b8a1..718fe41c 100644 --- a/bureau/locales/pt_BR/LC_MESSAGES/messages.po +++ b/bureau/locales/pt_BR/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: $Id: admin.po,v 1.2 2003/06/09 14:36:08 root Exp $\n" "Report-Msgid-Bugs-To: i18n@alternc.org\n" -"POT-Creation-Date: 2012-10-17 10:09+0200\n" +"POT-Creation-Date: 2012-10-17 11:45+0200\n" "PO-Revision-Date: 2007-10-25 23:50-0400\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: English \n" @@ -160,8 +160,8 @@ msgstr "Senha inicial" #: ../admin/adm_add.php:71 ../admin/adm_edit.php:89 ../admin/ftp_add.php:77 #: ../admin/ftp_edit.php:70 ../admin/hta_adduser.php:62 #: ../admin/hta_edit.php:110 ../admin/hta_edituser.php:55 -#: ../admin/mail_edit.inc.php:67 ../admin/mail_edit.php:96 -#: ../admin/sql_users_add.php:67 ../admin/sql_users_password.php:59 +#: ../admin/mail_edit.php:96 ../admin/sql_users_add.php:67 +#: ../admin/sql_users_password.php:59 #, fuzzy msgid "Confirm password" msgstr "Senha inicial" @@ -179,8 +179,7 @@ msgstr "Pode mudar a senha" #: ../admin/bro_main.php:104 ../admin/dom_dodel.php:74 #: ../admin/dom_edit.php:193 ../admin/dom_edit.php:205 #: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90 -#: ../admin/mail_list.php:143 ../admin/mail_localbox_edit.inc.php:57 -#: ../admin/sql_bck.php:87 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:143 ../admin/sql_bck.php:87 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:39 #: ../class/m_bro.php:70 msgid "No" @@ -197,8 +196,7 @@ msgstr "Não" #: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91 #: ../admin/mail_list.php:176 ../admin/mail_list.php:209 #: ../admin/mail_list.php:219 ../admin/mail_list.php:229 -#: ../admin/mail_list.php:239 ../admin/mail_localbox_edit.inc.php:58 -#: ../admin/sql_bck.php:88 ../admin/sql_del.php:90 +#: ../admin/mail_list.php:239 ../admin/sql_bck.php:88 ../admin/sql_del.php:90 #: ../admin/sql_users_del.php:76 ../admin/trash_dateselect.php:40 #: ../class/m_bro.php:70 msgid "Yes" @@ -244,9 +242,7 @@ msgstr "Criar está nova conta FTP." #: ../admin/browseforfolder.php:146 ../admin/ftp_add.php:80 #: ../admin/ftp_del.php:83 ../admin/ftp_edit.php:74 #: ../admin/hta_adduser.php:68 ../admin/hta_dodeluser.php:65 -#: ../admin/mail_edit.inc.php:80 ../admin/mail_edit.php:115 -#: ../admin/mail_localbox_edit.inc.php:68 -#: ../admin/mail_redirection_edit.inc.php:65 ../admin/piwik_user_dodel.php:64 +#: ../admin/mail_edit.php:115 ../admin/piwik_user_dodel.php:64 #: ../admin/sql_bck.php:105 ../admin/sql_users_add.php:73 #: ../admin/sql_users_password.php:65 ../admin/sql_users_rights.php:101 msgid "Cancel" @@ -322,9 +318,8 @@ msgstr "Editar" #: ../admin/adm_slaveip.php:87 ../admin/bro_main.php:278 ../admin/cron.php:54 #: ../admin/dom_edit.php:117 ../admin/ftp_del.php:82 #: ../admin/hta_dodeluser.php:64 ../admin/ip_main.php:74 -#: ../admin/ip_main.php:157 ../admin/mail_redirection_edit.inc.php:52 -#: ../admin/piwik_sitelist.php:74 ../admin/piwik_user_dodel.php:63 -#: ../admin/piwik_userlist.php:87 +#: ../admin/ip_main.php:157 ../admin/piwik_sitelist.php:74 +#: ../admin/piwik_user_dodel.php:63 ../admin/piwik_userlist.php:87 msgid "Delete" msgstr "Suprimir" @@ -602,7 +597,6 @@ msgid "OK?" msgstr "" #: ../admin/adm_doms.php:69 ../admin/dom_edit.php:99 -#: ../admin/mail_edit.inc.php:37 msgid "Status" msgstr "" @@ -828,7 +822,6 @@ msgstr "Você não pode mudar sua senha" #: ../admin/adm_slaveaccount.php:100 ../admin/cron.php:39 #: ../admin/ftp_add.php:76 ../admin/ftp_edit.php:69 #: ../admin/hta_adduser.php:58 ../admin/hta_edit.php:106 ../admin/index.php:77 -#: ../admin/mail_edit.inc.php:45 ../admin/mail_edit.inc.php:63 #: ../admin/sql_getparam.php:71 ../admin/sql_users_add.php:63 #: ../admin/sql_users_list.php:48 ../admin/sql_users_password.php:55 msgid "Password" @@ -998,7 +991,6 @@ msgid "Expiry" msgstr "" #: ../admin/adm_list.php:176 ../admin/dom_edit.php:136 -#: ../admin/mail_edit.inc.php:41 msgid "Disable" msgstr "" @@ -1956,7 +1948,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: ../admin/dom_edit.php:143 ../admin/mail_edit.inc.php:42 +#: ../admin/dom_edit.php:143 msgid "Enable" msgstr "" @@ -2319,16 +2311,6 @@ msgstr "Abaixar" msgid "Add %s mail to the domain %s" msgstr "Adiçionar um email ao domínio %s" -#: ../admin/mail_alias_create.inc.php:52 -#, fuzzy -msgid "Create this alias" -msgstr "Criar" - -#: ../admin/mail_alias_doedit.php:45 -#, php-format -msgid "Alias: %s already created" -msgstr "" - #: ../admin/mail_del.php:54 #, fuzzy msgid "Deleting mail accounts" @@ -2359,44 +2341,6 @@ msgstr "" msgid "Your email has been edited successfully" msgstr "Seu domínio %s foi instalado com sucesso" -#: ../admin/mail_edit.inc.php:39 -msgid "" -"Is this mail enabled ?
Having a mail disabled forbid consultation or " -"reception, but do not remove the mailbox or his configuration." -msgstr "" - -#: ../admin/mail_edit.inc.php:47 -msgid "" -"You need to have a password for some application (example: local mailbox);" -msgstr "" - -#: ../admin/mail_edit.inc.php:52 -#, fuzzy -msgid "Set a passowrd:" -msgstr "New password" - -#: ../admin/mail_edit.inc.php:55 -#, fuzzy -msgid "Change your password:" -msgstr "Mudança da senha SQL" - -#: ../admin/mail_edit.inc.php:79 ../admin/mail_edit.php:114 -#: ../admin/mail_localbox_edit.inc.php:67 -#: ../admin/mail_redirection_edit.inc.php:64 -#, fuzzy -msgid "Change this email address" -msgstr "Mudar esta caixa de email" - -#: ../admin/mail_edit.inc.php:95 -#, fuzzy -msgid "Password does not match" -msgstr "Membro '%s' não existe" - -#: ../admin/mail_edit.inc.php:99 -#, fuzzy -msgid "Password match" -msgstr "Senha" - #: ../admin/mail_edit.php:53 #, fuzzy, php-format msgid "Editing the email %s" @@ -2486,6 +2430,11 @@ msgstr "" msgid "one recipient per line" msgstr "Um email por linha" +#: ../admin/mail_edit.php:114 +#, fuzzy +msgid "Change this email address" +msgstr "Mudar esta caixa de email" + #: ../admin/mail_list.php:65 #, fuzzy msgid "Create a new mail account" @@ -2669,33 +2618,11 @@ msgstr "" msgid "POP3S" msgstr "" -#: ../admin/mail_localbox_doedit.php:53 -msgid "Already Activated" -msgstr "" - -#: ../admin/mail_localbox_doedit.php:62 -msgid "Already disactivated" -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:42 ../admin/mail_properties.php:43 +#: ../admin/mail_properties.php:43 #, fuzzy, php-format msgid "Edition of %s" msgstr "Adiçionar a caixa de email em %s" -#: ../admin/mail_localbox_edit.inc.php:50 -msgid "" -"WARNING: turning POP/IMAP off will DELETE the stored messages in this email " -"address. This email address will become a simple redirection." -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:52 -msgid "" -"Activate the localbox, will allow you to store your mails on this server. \n" -" It is a very conveniant way to check your mails while roaming,\n" -"\t\tthince they can be accesed remotely by POP or IMAP. It consume space on " -"the server so be sure to verify your quota attribution." -msgstr "" - #: ../admin/mail_properties.php:47 #, fuzzy msgid "Select your action" @@ -2709,15 +2636,6 @@ msgstr "" msgid "Unavaible, you need to set a password before" msgstr "" -#: ../admin/mail_redirection_edit.inc.php:58 -#, fuzzy -msgid "Clear all redirections" -msgstr "Redireção IP" - -#: ../admin/mail_redirection_edit.inc.php:77 -msgid "Are you sure you want to clear all redirections?" -msgstr "" - #: ../admin/main.php:33 msgid "Last Login: " msgstr "Último Login: " @@ -4359,6 +4277,30 @@ msgstr "" msgid "Real Media File" msgstr "" +#, fuzzy +#~ msgid "Create this alias" +#~ msgstr "Criar" + +#, fuzzy +#~ msgid "Set a passowrd:" +#~ msgstr "New password" + +#, fuzzy +#~ msgid "Change your password:" +#~ msgstr "Mudança da senha SQL" + +#, fuzzy +#~ msgid "Password does not match" +#~ msgstr "Membro '%s' não existe" + +#, fuzzy +#~ msgid "Password match" +#~ msgstr "Senha" + +#, fuzzy +#~ msgid "Clear all redirections" +#~ msgstr "Redireção IP" + #, fuzzy #~ msgid "This allow you to change your mail password." #~ msgstr "Você não pode mudar sua senha" diff --git a/lang/en_US.po b/lang/en_US.po index 21cb51f2..5eb7efe8 100644 --- a/lang/en_US.po +++ b/lang/en_US.po @@ -1494,8 +1494,8 @@ msgstr "" #: ../admin/adm_add.php:71 ../admin/adm_edit.php:89 ../admin/ftp_add.php:77 #: ../admin/ftp_edit.php:70 ../admin/hta_adduser.php:62 #: ../admin/hta_edit.php:110 ../admin/hta_edituser.php:55 -#: ../admin/mail_edit.inc.php:67 ../admin/mail_edit.php:96 -#: ../admin/sql_users_add.php:67 ../admin/sql_users_password.php:59 +#: ../admin/mail_edit.php:96 ../admin/sql_users_add.php:67 +#: ../admin/sql_users_password.php:59 msgid "Confirm password" msgstr "" @@ -1832,7 +1832,6 @@ msgid "OK?" msgstr "" #: ../admin/adm_doms.php:69 ../admin/dom_edit.php:99 -#: ../admin/mail_edit.inc.php:37 msgid "Status" msgstr "" @@ -2182,7 +2181,6 @@ msgid "Expiry" msgstr "" #: ../admin/adm_list.php:176 ../admin/dom_edit.php:136 -#: ../admin/mail_edit.inc.php:41 msgid "Disable" msgstr "" @@ -3069,7 +3067,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: ../admin/dom_edit.php:143 ../admin/mail_edit.inc.php:42 +#: ../admin/dom_edit.php:143 msgid "Enable" msgstr "" @@ -3398,15 +3396,6 @@ msgstr "" msgid "Add %s mail to the domain %s" msgstr "" -#: ../admin/mail_alias_create.inc.php:52 -msgid "Create this alias" -msgstr "" - -#: ../admin/mail_alias_doedit.php:45 -#, php-format -msgid "Alias: %s already created" -msgstr "" - #: ../admin/mail_del.php:54 msgid "Deleting mail accounts" msgstr "" @@ -3433,39 +3422,6 @@ msgstr "" msgid "Your email has been edited successfully" msgstr "" -#: ../admin/mail_edit.inc.php:39 -msgid "" -"Is this mail enabled ?
Having a mail disabled forbid consultation or " -"reception, but do not remove the mailbox or his configuration." -msgstr "" - -#: ../admin/mail_edit.inc.php:47 -msgid "" -"You need to have a password for some application (example: local mailbox);" -msgstr "" - -#: ../admin/mail_edit.inc.php:52 -msgid "Set a passowrd:" -msgstr "" - -#: ../admin/mail_edit.inc.php:55 -msgid "Change your password:" -msgstr "" - -#: ../admin/mail_edit.inc.php:79 ../admin/mail_edit.php:114 -#: ../admin/mail_localbox_edit.inc.php:67 -#: ../admin/mail_redirection_edit.inc.php:64 -msgid "Change this email address" -msgstr "" - -#: ../admin/mail_edit.inc.php:95 -msgid "Password does not match" -msgstr "" - -#: ../admin/mail_edit.inc.php:99 -msgid "Password match" -msgstr "" - #: ../admin/mail_edit.php:53 #, php-format msgid "Editing the email %s" @@ -3551,6 +3507,10 @@ msgstr "" msgid "one recipient per line" msgstr "" +#: ../admin/mail_edit.php:114 +msgid "Change this email address" +msgstr "" + #: ../admin/mail_list.php:65 msgid "Create a new mail account" msgstr "" @@ -3717,33 +3677,11 @@ msgstr "" msgid "POP3S" msgstr "" -#: ../admin/mail_localbox_doedit.php:53 -msgid "Already Activated" -msgstr "" - -#: ../admin/mail_localbox_doedit.php:62 -msgid "Already disactivated" -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:42 ../admin/mail_properties.php:43 +#: ../admin/mail_properties.php:43 #, php-format msgid "Edition of %s" msgstr "" -#: ../admin/mail_localbox_edit.inc.php:50 -msgid "" -"WARNING: turning POP/IMAP off will DELETE the stored messages in this email " -"address. This email address will become a simple redirection." -msgstr "" - -#: ../admin/mail_localbox_edit.inc.php:52 -msgid "" -"Activate the localbox, will allow you to store your mails on this server. \n" -" It is a very conveniant way to check your mails while roaming,\n" -"\t\tthince they can be accesed remotely by POP or IMAP. It consume space on " -"the server so be sure to verify your quota attribution." -msgstr "" - #: ../admin/mail_properties.php:47 msgid "Select your action" msgstr "" @@ -3756,14 +3694,6 @@ msgstr "" msgid "Unavaible, you need to set a password before" msgstr "" -#: ../admin/mail_redirection_edit.inc.php:58 -msgid "Clear all redirections" -msgstr "" - -#: ../admin/mail_redirection_edit.inc.php:77 -msgid "Are you sure you want to clear all redirections?" -msgstr "" - #: ../admin/main.php:33 msgid "Last Login: " msgstr ""