SF.net SVN: postfixadmin:[1036] trunk
Brought to you by:
christian_boltz,
gingerdog
From: <chr...@us...> - 2011-04-10 22:16:04
|
Revision: 1036 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1036&view=rev Author: christian_boltz Date: 2011-04-10 22:15:56 +0000 (Sun, 10 Apr 2011) Log Message: ----------- Changed delete.php to use flash_error(), removed some HTML from languages/* delete.php: - replace various $tMessage=... with flash_error() - always redirect to the relevant page, even if an error happened - fix error check in delete admin - removed HTML formatting (<b>, <span>) from some error messages - replaced check for pgsql + BEGIN/COMMIT/ROLLBACK with db_begin(), db_commit() and db_rollback() - the smarty message.tpl is most probably superfluous languages/*.lang: - removed HTML (<span>) from messages used by delete.php fetchmail.php, scripts/snippets/baseclass.php - remove superfluous </span> Modified Paths: -------------- trunk/delete.php trunk/fetchmail.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 trunk/scripts/snippets/baseclass.php Modified: trunk/delete.php =================================================================== --- trunk/delete.php 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/delete.php 2011-04-10 22:15:56 UTC (rev 1036) @@ -50,16 +50,11 @@ $result_admin = db_delete ('admin',$fWhere,$fDelete); $result_domain_admins = db_delete ('domain_admins',$fWhere,$fDelete); - if (!($result_admin == 1) and ($result_domain_admins >= 0)) - { - $error = 1; - $tMessage = $PALANG['pAdminDelete_admin_error']; + if ($result_admin != 1) { + flash_error($PALANG['pAdminDelete_admin_error']); } - else - { - $url = "list-admin.php"; - header ("Location: $url"); - } + header ("Location: list-admin.php"); + exit; } # ($fTable == "admin") elseif ($fTable == "domain") { @@ -78,14 +73,10 @@ if (!$result_domain || !domain_postdeletion($fDelete)) { - $error = 1; - $tMessage = $PALANG['pAdminDelete_domain_error']; + flash_error($PALANG['pAdminDelete_domain_error']); } - else - { - $url = "list-domain.php"; - header ("Location: $url"); - } + header ("Location: list-domain.php"); + exit; } # ($fTable == "domain") elseif ($fTable == "alias_domain") { @@ -93,10 +84,11 @@ $table_domain_alias = table_by_key('alias_domain'); $fWhere = 'alias_domain'; $fDelete = $fDomain; - if(db_delete('alias_domain',$fWhere,$fDelete)) { - $url = "list-domain.php"; - header ("Location: $url"); + if(db_delete('alias_domain',$fWhere,$fDelete) != 1) { + flash_error($PALANG['pAdminDelete_alias_domain_error']); } + header ("Location: list-domain.php"); + exit; } # ($fTable == "alias_domain") elseif ($fTable == "alias" or $fTable == "mailbox") @@ -105,16 +97,16 @@ if (!check_owner ($SESSID_USERNAME, $fDomain)) { $error = 1; - $tMessage = $PALANG['pDelete_domain_error'] . "<b>$fDomain</b>!</span>"; + flash_error($PALANG['pDelete_domain_error'] . "($fDomain)!"); } elseif (!check_alias_owner ($SESSID_USERNAME, $fDelete)) { $error = 1; - $tMessage = $PALANG['pDelete_alias_error'] . "<b>$fDelete</b>!</span>"; + flash_error($PALANG['pDelete_alias_error'] . "($fDelete)!"); } else { - if ($CONF['database_type'] == "pgsql") db_query('BEGIN'); + db_begin(); /* there may be no aliases to delete */ $result = db_query("SELECT * FROM $table_alias WHERE address = '$fDelete' AND domain = '$fDomain'"); if($result['rows'] == 1) { @@ -130,7 +122,7 @@ if ($result['rows'] != 1 || !$postdel_res) { $error = 1; - $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> ("; + $tMessage = $PALANG['pDelete_delete_error'] . "$fDelete ("; if ($result['rows']!=1) { $tMessage.='mailbox'; @@ -140,7 +132,8 @@ { $tMessage.='post-deletion'; } - $tMessage.=')</span>'; + $tMessage.=')'; + flash_error($tMessage); } db_log ($fDomain, 'delete_mailbox', $fDelete); } @@ -161,21 +154,24 @@ if ($error != 1) { - if ($CONF['database_type'] == "pgsql") db_query('COMMIT'); - header ("Location: list-virtual.php?domain=$fDomain"); - exit; + db_commit(); } else { - $tMessage .= $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (physical mail)!</span>"; - if ($CONF['database_type'] == "pgsql") db_query('ROLLBACK'); + flash_error($PALANG['pDelete_delete_error'] . "$fDelete (physical mail)!"); + db_rollback(); } + header ("Location: list-virtual.php?domain=$fDomain"); + exit; } else { flash_error($PALANG['invalid_parameter']); + header("Location: main.php"); + exit; } +# we should most probably never reach this point $smarty->assign ('smarty_template', 'message'); -$smarty->assign ('tMessage', $tMessage); +$smarty->assign ('tMessage', $tMessage . " If you see this, please open a bugreport and include the exact delete.php parameters."); $smarty->display ('index.tpl'); Modified: trunk/fetchmail.php =================================================================== --- trunk/fetchmail.php 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/fetchmail.php 2011-04-10 22:15:56 UTC (rev 1036) @@ -146,7 +146,7 @@ $result = db_query ("delete from $table_fetchmail WHERE id=".$delete); if ($result['rows'] != 1) { - flash_error($PALANG['pDelete_delete_error']) . '</span>'; + flash_error($PALANG['pDelete_delete_error']); } else { flash_info(sprintf($PALANG['pDelete_delete_success'],$account)); } Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/bg.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -84,12 +84,12 @@ $PALANG['pOverview_get_quota'] = 'Обем на пощенската кутия (MB)'; $PALANG['pOverview_get_modified'] = 'Последно модифициран'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Не мога да изтрия записа '; +$PALANG['pDelete_delete_error'] = 'Не мога да изтрия записа '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Не мога да изтрия пощенската кутия'; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Този домейн не е ваш! '; +$PALANG['pDelete_domain_error'] = 'Този домейн не е ваш! '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Този домейн не е ваш '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -280,8 +280,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Добави домейн'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Не мога да добавя домейна!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Домейна бе добавен успешно!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Грешка при изтриването на домейна!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Грешка при изтриването на домейна!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Редактиране на домейн'; $PALANG['pAdminEdit_domain_domain'] = 'Домейн'; Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/ca.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -82,12 +82,12 @@ $PALANG['pOverview_get_quota'] = 'Quota de bústia (MB)'; $PALANG['pOverview_get_modified'] = 'Última Modificació'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Imposible borrar el registre '; +$PALANG['pDelete_delete_error'] = 'Imposible borrar el registre '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Aquest domini no et pertany '; +$PALANG['pDelete_domain_error'] = 'Aquest domini no et pertany '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -278,8 +278,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Afegir domini'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Imposible afegir el domini!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Editar un domini'; $PALANG['pAdminEdit_domain_domain'] = 'Domini'; Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/cn.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -83,12 +83,12 @@ $PALANG['pOverview_get_quota'] = '邮箱限制 (MB)'; $PALANG['pOverview_get_modified'] = '最后修改日期'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">不能删除本记录'; +$PALANG['pDelete_delete_error'] = '不能删除本记录'; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">你没有该域的管理权限'; +$PALANG['pDelete_domain_error'] = '你没有该域的管理权限'; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -279,8 +279,8 @@ $PALANG['pAdminCreate_domain_button'] = '新增'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">新增域失败!</span>'; $PALANG['pAdminCreate_domain_result_success'] = '新增域成功!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = '修改域'; $PALANG['pAdminEdit_domain_domain'] = '域名'; Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/cs.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -88,12 +88,12 @@ $PALANG['pOverview_get_quota'] = 'Místo pro schránku (MB)'; $PALANG['pOverview_get_modified'] = 'Naposledy změněno'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Nelze smazat položku '; +$PALANG['pDelete_delete_error'] = 'Nelze smazat položku '; $PALANG['pDelete_delete_success'] = '%s odstraněn.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nelze odstranit schránku '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Tato doména není vaše '; +$PALANG['pDelete_domain_error'] = 'Tato doména není vaše '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Nelze odstranit přesměrování '; +$PALANG['pDelete_alias_error'] = 'Nelze odstranit přesměrování '; $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -288,8 +288,8 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nepodařilo se přidat doménu!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nepodařilo se odstranit doménu!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Nepodařilo se odstranit doménu!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Upravit doménu'; $PALANG['pAdminEdit_domain_domain'] = 'Doména'; Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/da.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -86,12 +86,12 @@ $PALANG['pOverview_get_quota'] = 'Postboks Kvota (MB)'; $PALANG['pOverview_get_modified'] = 'Senest ændret'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan ikke slette denne post '; +$PALANG['pDelete_delete_error'] = 'Kan ikke slette denne post '; $PALANG['pDelete_delete_success'] = '%s er slettet.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kunne ikke fjerne postkassen '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit '; +$PALANG['pDelete_domain_error'] = 'Dette domæne er ikke dit '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kunne ikke slette aliaset '; +$PALANG['pDelete_alias_error'] = 'Kunne ikke slette aliaset '; $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -286,8 +286,8 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilføje domæne!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domænet kunne ikke slettes!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Domænet kunne ikke slettes!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne'; $PALANG['pAdminEdit_domain_domain'] = 'Domæne'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/de.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -85,12 +85,12 @@ $PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)'; $PALANG['pOverview_get_modified'] = 'Zuletzt verändert'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Eintrag konnte nicht gelöscht werden '; +$PALANG['pDelete_delete_error'] = 'Eintrag konnte nicht gelöscht werden '; $PALANG['pDelete_delete_success'] = '%s gelöscht.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Mailbox konnte nicht gelöscht werden '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen '; +$PALANG['pDelete_domain_error'] = 'Diese Domain gehört nicht Ihnen '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Alias konnte nicht gelöscht werden '; +$PALANG['pDelete_alias_error'] = 'Alias konnte nicht gelöscht werden '; $PALANG['pCreate_alias_domain_welcome'] = 'Adressen einer Ihrer Domains auf eine andere Domain weiterleiten.'; $PALANG['pCreate_alias_domain_alias'] = 'Alias-Domain'; $PALANG['pCreate_alias_domain_alias_text'] = 'Die Domain, für die Mails hereinkommen.'; @@ -285,8 +285,8 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Konnte Domain nicht anlegen!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domain wurde angelegt!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domain konnte nicht gelöscht werden!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Alias-Domain konnte nicht gelöscht werden!</span>'; +$PALANG['pAdminDelete_domain_error'] = 'Domain konnte nicht gelöscht werden!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Alias-Domain konnte nicht gelöscht werden!'; $PALANG['pAdminEdit_domain_welcome'] = 'Domain editieren'; $PALANG['pAdminEdit_domain_domain'] = 'Domain'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/en.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -86,12 +86,12 @@ $PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)'; $PALANG['pOverview_get_modified'] = 'Last Modified'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Unable to delete the entry '; +$PALANG['pDelete_delete_error'] = 'Unable to delete the entry '; $PALANG['pDelete_delete_success'] = '%s deleted.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">This domain is not yours '; +$PALANG['pDelete_domain_error'] = 'This domain is not yours '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; @@ -287,8 +287,9 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Unable to add domain!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domain has been added!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; $PALANG['pAdminEdit_domain_welcome'] = 'Edit a domain'; $PALANG['pAdminEdit_domain_domain'] = 'Domain'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/es.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -83,12 +83,12 @@ $PALANG['pOverview_get_quota'] = 'Cuota de buzón (MB)'; $PALANG['pOverview_get_modified'] = 'Última Modificación'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Imposible borrar el registro '; +$PALANG['pDelete_delete_error'] = 'Imposible borrar el registro '; $PALANG['pDelete_delete_success'] = '%s borrado.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">No se pudo eliminar el buzón '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Este dominio no le pertenece '; +$PALANG['pDelete_domain_error'] = 'Este dominio no le pertenece '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Este dominio no te pertenece '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">No se pudo eliminar el alias '; +$PALANG['pDelete_alias_error'] = 'No se pudo eliminar el alias '; $PALANG['pCreate_alias_domain_welcome'] = 'Sincronizar direcciones de un dominio a otro.'; $PALANG['pCreate_alias_domain_alias'] = 'Alias de Dominio'; $PALANG['pCreate_alias_domain_alias_text'] = 'El dominio al que llega el email.'; @@ -280,8 +280,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Añadir dominio'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">¡Imposible añadir el dominio!</span>'; $PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">¡No se pudo eliminar el dominio!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">¡No se pudo eliminar el alias de dominio!</span>'; +$PALANG['pAdminDelete_domain_error'] = '¡No se pudo eliminar el dominio!'; +$PALANG['pAdminDelete_alias_domain_error'] = '¡No se pudo eliminar el alias de dominio!'; $PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio'; $PALANG['pAdminEdit_domain_domain'] = 'Dominio'; Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/et.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -83,12 +83,12 @@ $PALANG['pOverview_get_quota'] = 'Postkasti kettaruumi piirang (MB)'; $PALANG['pOverview_get_modified'] = 'Viimati muudetud'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kustutamine ebaõnnestus. Kirje: '; +$PALANG['pDelete_delete_error'] = 'Kustutamine ebaõnnestus. Kirje: '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Puuduvad õigused. Domeen: '; +$PALANG['pDelete_domain_error'] = 'Puuduvad õigused. Domeen: '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -279,8 +279,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Lisa domeen'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domeeni lisamine ebaõnnestus!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Redigeeri domeeni'; $PALANG['pAdminEdit_domain_domain'] = 'Domeen'; Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/eu.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -82,12 +82,12 @@ $PALANG['pOverview_get_quota'] = 'Postontzi kuota (MB)'; $PALANG['pOverview_get_modified'] = 'Azken aldaketa'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Ezinezkoa sarrera ezabatzea '; +$PALANG['pDelete_delete_error'] = 'Ezinezkoa sarrera ezabatzea '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ez zara domeinu honen jabe'; +$PALANG['pDelete_domain_error'] = 'Ez zara domeinu honen jabe'; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -277,8 +277,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Domeinua gehitu'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Ezinezkoa domeinua gehitzea!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domeinua gehituta!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Domeinu bat aldatu'; $PALANG['pAdminEdit_domain_domain'] = 'Domeinua'; Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/fi.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -84,12 +84,12 @@ $PALANG['pOverview_get_quota'] = 'Postilaatikon kiintiö (MB)'; $PALANG['pOverview_get_modified'] = 'Viimeksi muokattu'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Tietueen poisto ei onnistu '; +$PALANG['pDelete_delete_error'] = 'Tietueen poisto ei onnistu '; $PALANG['pDelete_delete_success'] = '%s poistettu.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Sähköpostilaatikkoa ei voitu poistaa '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Tämä ei ole sinun domainisi '; +$PALANG['pDelete_domain_error'] = 'Tämä ei ole sinun domainisi '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Tämä ei ole sinun domainisi '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Aliasta ei voitu poistaa '; +$PALANG['pDelete_alias_error'] = 'Aliasta ei voitu poistaa '; $PALANG['pCreate_alias_domain_welcome'] = 'Peiliosoitteet domainistasi toiseen.'; $PALANG['pCreate_alias_domain_alias'] = 'Alias Domaini'; $PALANG['pCreate_alias_domain_alias_text'] = 'Domaini johon sähköpostit tulevat.'; @@ -279,8 +279,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Lisää domain'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domainin lisäys ei onnistunut!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domain on lisätty!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domainin voitu poistaa!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Domainin aliasta ei voitu poistaa!</span>'; +$PALANG['pAdminDelete_domain_error'] = 'Domainin voitu poistaa!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Domainin aliasta ei voitu poistaa!'; $PALANG['pAdminEdit_domain_welcome'] = 'Muokkaa domainia'; $PALANG['pAdminEdit_domain_domain'] = 'Domain'; Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/fo.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -83,12 +83,12 @@ $PALANG['pOverview_get_quota'] = 'Postkassa kvota (MB)'; $PALANG['pOverview_get_modified'] = 'Síðst broytt'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Fái ikki strikað '; +$PALANG['pDelete_delete_error'] = 'Fái ikki strikað '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Hetta er ikki títt navnaøki '; +$PALANG['pDelete_domain_error'] = 'Hetta er ikki títt navnaøki '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -279,8 +279,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Stovna navnaøki'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Fái ikki stovnað navnaøki!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Navnaøki er stovnað!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Broyt navnaøki'; $PALANG['pAdminEdit_domain_domain'] = 'Navnaøki'; Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/fr.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -85,12 +85,12 @@ $PALANG['pOverview_get_quota'] = 'Limite compte courriels (MB)'; $PALANG['pOverview_get_modified'] = 'Dernière Modification'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Impossible d\'effacer cette entrée '; +$PALANG['pDelete_delete_error'] = 'Impossible d\'effacer cette entrée '; $PALANG['pDelete_delete_success'] = '%s supprimé.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Impossible d\'effacer ce compte courriel'; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ce domaine n\'est pas le votre '; +$PALANG['pDelete_domain_error'] = 'Ce domaine n\'est pas le votre '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Ce domaine n\'est pas le votre '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Impossible d\'effacer cet alias '; +$PALANG['pDelete_alias_error'] = 'Impossible d\'effacer cet alias '; $PALANG['pCreate_alias_domain_welcome'] = 'Les adresses mirroirs de l\'un de vos domaines vers un autre.'; $PALANG['pCreate_alias_domain_alias'] = 'Alias Domaine'; $PALANG['pCreate_alias_domain_alias_text'] = 'Le domaine dans lequel les courriels viennent.'; @@ -281,8 +281,8 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Impossible d\'ajouter le domaine!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Le domaine a été ajouté!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Impossible de supprimer le domain!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Impossible de supprimé cet alias de domaine!</span>'; +$PALANG['pAdminDelete_domain_error'] = 'Impossible de supprimer le domain!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Impossible de supprimé cet alias de domaine!'; $PALANG['pAdminEdit_domain_welcome'] = 'Modifier un domaine'; $PALANG['pAdminEdit_domain_domain'] = 'Domaine'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/hr.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -82,12 +82,12 @@ $PALANG['pOverview_get_quota'] = 'Kvota za potanske ormariće (MB)'; $PALANG['pOverview_get_modified'] = 'Zadnja promjena'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Unos nije bilo moguče izbrisati '; +$PALANG['pDelete_delete_error'] = 'Unos nije bilo moguče izbrisati '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Izabrana domena nije pod vaim nadzorom '; +$PALANG['pDelete_domain_error'] = 'Izabrana domena nije pod vaim nadzorom '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -278,8 +278,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Dodaj domenu'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domenu nije bilo moguče dodati!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspjeno dodana!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Uredi domenu'; $PALANG['pAdminEdit_domain_domain'] = 'Domena'; Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/hu.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -85,12 +85,12 @@ $PALANG['pOverview_get_quota'] = 'Postafiók Quota (MB)'; $PALANG['pOverview_get_modified'] = 'Utolsó módosítás'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Nem sikerült törölni a bejegyzést '; +$PALANG['pDelete_delete_error'] = 'Nem sikerült törölni a bejegyzést '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nem sikerült törölni a mailbox-ot '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ehhez a domainhez nincs jogosultságod '; +$PALANG['pDelete_domain_error'] = 'Ehhez a domainhez nincs jogosultságod '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Nem sikerült törölni az alias-t '; +$PALANG['pDelete_alias_error'] = 'Nem sikerült törölni az alias-t '; $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -285,8 +285,8 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">A domain felvétele sikertelen!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'A domain-t felvettük az adatbázisba!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">A domain törlése nem sikerült!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'A domain törlése nem sikerült!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Domain szerkesztése'; $PALANG['pAdminEdit_domain_domain'] = 'Domain'; Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/is.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -83,12 +83,12 @@ $PALANG['pOverview_get_quota'] = 'Pósthólfs kvóti (MB)'; $PALANG['pOverview_get_modified'] = 'Síðast breytt'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Get ekki eytt færslunni '; +$PALANG['pDelete_delete_error'] = 'Get ekki eytt færslunni '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Þetta er ekki þitt lén '; +$PALANG['pDelete_domain_error'] = 'Þetta er ekki þitt lén '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -278,8 +278,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Bæta við léni'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Get ekki bætt við léni!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Lén hefur verið bætt inn!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Breyta léni'; $PALANG['pAdminEdit_domain_domain'] = 'Lén'; Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/it.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -84,12 +84,12 @@ $PALANG['pOverview_get_quota'] = 'Quota delle caselle di posta (MB)'; $PALANG['pOverview_get_modified'] = 'Ultima modifica'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Impossibile cancellare '; +$PALANG['pDelete_delete_error'] = 'Impossibile cancellare '; $PALANG['pDelete_delete_success'] = '%s cancellati.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Impossibile cancellare la casella '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Questo dominio non è tuo '; +$PALANG['pDelete_domain_error'] = 'Questo dominio non è tuo '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Impossibile cancellate lo alias '; +$PALANG['pDelete_alias_error'] = 'Impossibile cancellate lo alias '; $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -280,8 +280,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Aggiungi dominio'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Impossibile aggiungere il dominio!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Il dominio è stato aggiunto!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Impossibile cancellare il dominio!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Impossibile cancellare il dominio!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Modifica un domain'; $PALANG['pAdminEdit_domain_domain'] = 'Dominio'; Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/ja.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -85,12 +85,12 @@ $PALANG['pOverview_get_mailboxes'] = 'アドレス'; $PALANG['pOverview_get_quota'] = '容量制限 (MB)'; $PALANG['pOverview_get_modified'] = '最終更新日'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">エントリを削除できません。 '; +$PALANG['pDelete_delete_error'] = 'エントリを削除できません。 '; $PALANG['pDelete_delete_success'] = '%s を削除しました。'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">メールアドレスを削除できません。 '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">このドメインは管理外です。 '; +$PALANG['pDelete_domain_error'] = 'このドメインは管理外です。 '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">転送アドレスを削除できません。 '; +$PALANG['pDelete_alias_error'] = '転送アドレスを削除できません。 '; $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -285,8 +285,8 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">ドメインを追加できません!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'ドメインを追加しました。'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">ドメインが削除できません!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'ドメインが削除できません!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'ドメインの修正'; $PALANG['pAdminEdit_domain_domain'] = 'ドメイン'; Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/lt.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -82,12 +82,12 @@ $PALANG['pOverview_get_quota'] = 'Pašto dėžutės kvota (MB)'; $PALANG['pOverview_get_modified'] = 'Paskutinis keitimas'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Įrašo pašalinti nepavyko '; +$PALANG['pDelete_delete_error'] = 'Įrašo pašalinti nepavyko '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ne jūsų sritis '; +$PALANG['pDelete_domain_error'] = 'Ne jūsų sritis '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -278,8 +278,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Registruoti sritį'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Srities užregistruoti nepavyko!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Sritis užregistruota!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Keisti sritį'; $PALANG['pAdminEdit_domain_domain'] = 'Sritis'; Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/mk.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -83,12 +83,12 @@ $PALANG['pOverview_get_quota'] = 'Квота на сандаче (MB)'; $PALANG['pOverview_get_modified'] = 'Последна промена'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Не можам да го избришам записот '; +$PALANG['pDelete_delete_error'] = 'Не можам да го избришам записот '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Овој домен не е ваш '; +$PALANG['pDelete_domain_error'] = 'Овој домен не е ваш '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -280,8 +280,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Додади домен'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Не можам да го додадам доменот!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Доменот е додаден!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Измена на домен'; $PALANG['pAdminEdit_domain_domain'] = 'Домен'; Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/nb.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -85,12 +85,12 @@ $PALANG['pOverview_get_quota'] = 'Kvote for e-postkonto (MB)'; $PALANG['pOverview_get_modified'] = 'Sist endret'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan ikke slette oppføringen '; +$PALANG['pDelete_delete_error'] = 'Kan ikke slette oppføringen '; $PALANG['pDelete_delete_success'] = '%s slettet.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kan ikke slette e-postkontoen '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domenet tilhører deg ikke '; +$PALANG['pDelete_domain_error'] = 'Dette domenet tilhører deg ikke '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Dette domenet tilhører deg ikke '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kan ikke slette alias '; +$PALANG['pDelete_alias_error'] = 'Kan ikke slette alias '; $PALANG['pCreate_alias_domain_welcome'] = 'Videresender alt som sendes til et domene til et annet domene.'; $PALANG['pCreate_alias_domain_alias'] = 'Aliasdomene'; $PALANG['pCreate_alias_domain_alias_text'] = 'Domenet de innkommende e-postmeldingene er adressert til.'; @@ -280,8 +280,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Legg til domene'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kunne ikke opprette domenet!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domenet er blitt opprettet!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domenet!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domenealias!</span>'; +$PALANG['pAdminDelete_domain_error'] = 'Kunne ikke fjerne domenet!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Kunne ikke fjerne domenealias!'; $PALANG['pAdminEdit_domain_welcome'] = 'Endre et domene'; $PALANG['pAdminEdit_domain_domain'] = 'Domene'; Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/nl.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -84,12 +84,12 @@ $PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)'; $PALANG['pOverview_get_modified'] = 'Laatst bewerkt'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Mislukt te verwijderen '; +$PALANG['pDelete_delete_error'] = 'Mislukt te verwijderen '; $PALANG['pDelete_delete_success'] = '%s verwijderd.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Niet in staat mailbox te verwijderen '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dit is niet uw domein '; +$PALANG['pDelete_domain_error'] = 'Dit is niet uw domein '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Dit is niet uw domein '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Niet in staat alias te verwijderen '; +$PALANG['pDelete_alias_error'] = 'Niet in staat alias te verwijderen '; $PALANG['pCreate_alias_domain_welcome'] = 'Spiegel een van uw domeinen naar een ander domein.'; $PALANG['pCreate_alias_domain_alias'] = 'Alias domein'; $PALANG['pCreate_alias_domain_alias_text'] = 'Het domein waar mail voor binnen komt.'; @@ -280,8 +280,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Voeg Domein toe'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Mislukt om het domein toe te voegen.</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domein is toegevoegd!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Niet in staat domein te verwijderen!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Niet in staat domein alias te verwijderen!</span>'; +$PALANG['pAdminDelete_domain_error'] = 'Niet in staat domein te verwijderen!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Niet in staat domein alias te verwijderen!'; $PALANG['pAdminEdit_domain_welcome'] = 'Bewerk een domein'; $PALANG['pAdminEdit_domain_domain'] = 'Domein'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/nn.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -83,12 +83,12 @@ $PALANG['pOverview_get_quota'] = 'Epostkonto Kvote (MB)'; $PALANG['pOverview_get_modified'] = 'Sist endret'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan ikke slette'; +$PALANG['pDelete_delete_error'] = 'Kan ikke slette'; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domenet er ikke ditt'; +$PALANG['pDelete_domain_error'] = 'Dette domenet er ikke ditt'; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX @@ -277,8 +277,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Legg til domene'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Klarte ikke å legge til domenet!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domenet er lagt til!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Endre domenet'; $PALANG['pAdminEdit_domain_domain'] = 'Domene'; Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/pl.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -86,12 +86,12 @@ $PALANG['pOverview_get_quota'] = 'Udział (MB)'; $PALANG['pOverview_get_modified'] = 'Ostatnio zmodyfikowany'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Nie można usunąć tego wpisu '; +$PALANG['pDelete_delete_error'] = 'Nie można usunąć tego wpisu '; $PALANG['pDelete_delete_success'] = '%s usunięty.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nie można usunąć konta '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ta domena nie należy do Ciebie '; +$PALANG['pDelete_domain_error'] = 'Ta domena nie należy do Ciebie '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Ten alias domeny nie należy do Ciebie '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Nie można usunąć aliasu '; +$PALANG['pDelete_alias_error'] = 'Nie można usunąć aliasu '; $PALANG['pCreate_alias_domain_welcome'] = 'Duplikuj adresy z jednej Twojej domeny do innej.'; $PALANG['pCreate_alias_domain_alias'] = 'Domena aliasowana/źródłowa'; $PALANG['pCreate_alias_domain_alias_text'] = 'Domena do której przychodzą maile.'; @@ -282,8 +282,8 @@ $PALANG['pAdminCreate_domain_button'] = 'Dodaj domenę'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nie można dodać domeny!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domena została dodana!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nie można usunąć domeny!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Nie można usunąć aliasu domeny!</span>'; +$PALANG['pAdminDelete_domain_error'] = 'Nie można usunąć domeny!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Nie można usunąć aliasu domeny!'; $PALANG['pAdminEdit_domain_welcome'] = 'Edytuj domenę'; $PALANG['pAdminEdit_domain_domain'] = 'Domena'; Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/pt-br.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -86,12 +86,12 @@ $PALANG['pOverview_get_quota'] = 'Cota de Espaço (MB)'; $PALANG['pOverview_get_modified'] = 'Última Modificação'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Não foi possível remover o registro '; +$PALANG['pDelete_delete_error'] = 'Não foi possível remover o registro '; $PALANG['pDelete_delete_success'] = '%s removido.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Não foi possível remover a conta de email '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Domínio não lhe pertence '; +$PALANG['pDelete_domain_error'] = 'Domínio não lhe pertence '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Domínio não lhe pertence '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Não foi possível remover o alias '; +$PALANG['pDelete_alias_error'] = 'Não foi possível remover o alias '; $PALANG['pCreate_alias_domain_welcome'] = 'Configuração de espelhamento de endereços de um domínio para outro.'; $PALANG['pCreate_alias_domain_alias'] = 'Alias de Domínio'; @@ -287,8 +287,8 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Não foi possível criar o domínio!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domínio criado!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Não foi possível remover o domínio!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Não foi possível remover o alias de domínio!</span>'; +$PALANG['pAdminDelete_domain_error'] = 'Não foi possível remover o domínio!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Não foi possível remover o alias de domínio!'; $PALANG['pAdminEdit_domain_welcome'] = 'Edição de domínio.'; $PALANG['pAdminEdit_domain_domain'] = 'Domínio'; Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2011-04-10 22:12:56 UTC (rev 1035) +++ trunk/languages/ru.lang 2011-04-10 22:15:56 UTC (rev 1036) @@ -87,12 +87,12 @@ $PALANG['pOverview_get_quota'] = 'Квота ящика (МБ)'; $PALANG['pOverview_get_modified'] = 'Последнее изменение'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Невозможно удалить запись '; +$PALANG['pDelete_delete_error'] = 'Невозможно удалить запись '; $PALANG['pDelete_delete_success'] = '%s удален.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Невозможно удалить ящик '; -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Этот домен не принадлежит вам '; +$PALANG['pDelete_domain_error'] = 'Этот домен не принадлежит вам '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Этот домен не принадлежит вам '; -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Невозможно удалить алиас '; +$PALANG['pDelete_alias_error'] = 'Невозможно удалить алиас '; $PALANG['pCreate_alias_domain_welcome'] = 'Отображать адреса одного вашего домена на другой.'; $PALANG['pCreate_alias_domain_alias'] = 'Домен-алиас'; $PALANG['pCreate_alias_domain_alias_text'] = 'Домен, в который приходит почта.'; @@ -287,8 +287,8 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Невозможно добавить домен!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Домен был добавлен!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Невозможно удалить домен!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Невозможно удалить домен-алиас!</span>'; +$PALANG['pAdminDelete_domain_error'] = 'Невозможно удалить домен!'; +$PALANG['pAdminDelete_alias_domain_error'] = 'Невозможно удалить домен-алиас!'; $PALANG['pAdminEdit_domain_welcome'] = 'Редактирование домена'; $PALANG['pAdminEdit_domain_domain'] = 'Домен'; Modified: trunk/languages/sk.lang ===... [truncated message content] |