SF.net SVN: postfixadmin: [163] trunk
Brought to you by:
christian_boltz,
gingerdog
From: <chr...@us...> - 2007-10-25 22:59:50
|
Revision: 163 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=163&view=rev Author: christian_boltz Date: 2007-10-25 15:59:52 -0700 (Thu, 25 Oct 2007) Log Message: ----------- The work of two nights causes a long changelog. Here we go: fetchmail.php: - IMPORTANT: fixed typo in database column name. If you have created the fetchmail database already, you have to rename the "pool_time" column to "poll_time" - fixed adding of new entries - don't display status fields (last poll date and result) in edit mode - validate and quote the GET and POST variables - show POSTed data again if invalid values were entered (data to display in the edit form is passed to fetchmail.tpl in $formvars) - check results of database operations and display error/success messages - check owner of target mailbox on all operations - changed password handling: empty means no change (instead of sending "******" around) - reworked and moved around large code portions - added some TODO notes fetchmail.tpl: - use data from $formvars in edit mode instead of parsing the full array - moved "new entry" below the table - replaced delete button with delete links - Note: the boolean fields need testing with PgSQL. Especially test if they are displayed as active correctly in list and edit mode! *.lang: - added several fetchmail-related strings, more to follow - added $PALANG['please_keep_this_as_last_entry'] which always has to be the last entry in the language files. This solves the problem that language-check.sh mixes up the string order when adding strings at the end of the language files. - added vim:ft=php Modified Paths: -------------- 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/lt.lang trunk/languages/mk.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/templates/fetchmail.tpl Modified: trunk/fetchmail.php =================================================================== --- trunk/fetchmail.php 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/fetchmail.php 2007-10-25 22:59:52 UTC (rev 163) @@ -20,11 +20,17 @@ * * Template Variables: * - * TODO - * * Form POST \ GET Variables: * - * TODO + * GET: + * - edit + * - delete + * - new + * + * POST: + * - save + * - cancel + * - all editable form values, see $fm_struct */ /* new sql table: fetchmail @@ -37,7 +43,7 @@ src_user varchar(255) not null default '', src_password varchar(255) not null default '', src_folder varchar(255) not null default '', - pool_time int(11) unsigned not null default 10, + poll_time int(11) unsigned not null default 10, fetchall tinyint(1) unsigned not null default 0, keep tinyint(1) unsigned not null default 0, protocol enum('POP3','IMAP','POP2','ETRN','AUTO'), @@ -57,6 +63,16 @@ $extra_options = 0; if ($CONF['fetchmail_extra_options'] == 'YES') $extra_options = 1; +# import control GET/POST variables. Form values are imported below. +$new = (int) safeget ("new") == 1 ? 1:0; +$edit = (int) safeget ("edit"); +$delete = (int) safeget ("delete"); +$save = safepost("save") != "" ? 1:0; +$cancel = safepost("cancel") != "" ? 1:0; + +$display_status = 1; +if ($new || $edit) $display_status = 0; + $fm_struct=array( // list($editible,$view,$type,$title,$comment) # first column: allow editing? # second column: display field? @@ -67,14 +83,14 @@ "src_user" =>array(1,1,'text', 'User','Remote User'), "src_password" =>array(1,0,'password', 'Password','Remote Password'), "src_folder" =>array(1,1,'text', 'Folder','Remote Folder'), - "pool_time" =>array(1,1,'num', 'Poll','Poll Time (min)'), + "poll_time" =>array(1,1,'num', 'Poll','Poll Time (min)'), "fetchall" =>array(1,1,'bool', 'Fetch All','Retrieve both old (seen) and new messages'), "keep" =>array(1,1,'bool', 'Keep','Keep retrieved messages on the remote mailserver'), "protocol" =>array(1,1,'enum', 'Protocol','Protocol to use'), "extra_options" =>array($extra_options,$extra_options,'longtext', 'Extra Options','Extra fetchmail Options'), "mda" =>array($extra_options,$extra_options,'longtext', 'MDA','Mail Delivery Agent'), - "date" =>array(0,1,'text', 'Date','Date of last pooling/configuration change'), - "returned_text" =>array(0,1,'longtext', 'Returned Text','Text message from last pooling'), + "date" => array(0,$display_status,'text', 'Date','Date of last polling/configuration change'), + "returned_text" => array(0,$display_status,'longtext', 'Returned Text','Text message from last polling'), ); $SESSID_USERNAME = authentication_get_username(); @@ -84,7 +100,7 @@ $fm_defaults=array( "id" =>0, "mailbox" => array($SESSID_USERNAME), - "pool_time" =>10, + "poll_time" => 10, "src_auth" => array('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'), "protocol" => @@ -93,9 +109,9 @@ $list_domains = list_domains_for_admin ($SESSID_USERNAME); -$user_domains=implode("','",array_values($list_domains)); # for displaying +$user_domains=implode(", ",array_values($list_domains)); # for displaying $user_domains_sql=implode("','",escape_string(array_values($list_domains))); # for SQL -$sql="SELECT username FROM mailbox WHERE domain in ('".$user_domains_sql."')"; +$sql="SELECT username FROM mailbox WHERE domain in ('".$user_domains_sql."')"; # TODO: replace with domain selection dropdown $res = db_query ($sql); if ($res['rows'] > 0){ @@ -109,56 +125,112 @@ $fm_defaults["mailbox"][]=$SESSID_USERNAME; # TODO: Does this really make sense? Or should we display a message "please create a mailbox first!"? } -$new = (int) safeget ("new"); -$edit = (int) safeget ("edit"); -$delete = safepost("delete"); -$save = safepost("save"); -$cancel = safepost("cancel"); +$row_id = 0; +if ($delete) { + $row_id = $delete; +} elseif ($edit) { + $row_id = $edit; +} -if ($cancel){ +if ($row_id) { + $result = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM fetchmail WHERE id=" . $row_id); + if ($result['rows'] > 0) { + $edit_row = db_array ($result['result']); + $account = $edit_row['src_user'] . " @ " . $edit_row['src_server']; + } + + $edit_row_domain = explode('@', $edit_row['mailbox']); + if ($result['rows'] <= 0 || !check_owner($SESSID_USERNAME, $edit_row_domain[1])) { # owner check for $edit and $delete + flash_error(sprintf($PALANG['pFetchmail_error_invalid_id'], $row_id)); + $edit = 0; $delete = 0; + } +} + + +if ($cancel) { $edit=0; -} -elseif($edit && $save){ - $_vals=array(); +} elseif ($delete) { + $result = db_query ("delete from fetchmail WHERE id=".$delete); + if ($result['rows'] != 1) + { + flash_error($PALANG['pDelete_delete_error']) . '</span'; + } else { + flash_info(sprintf($PALANG['pDelete_delete_success'],$account)); + } + $delete=0; +} elseif ( ($edit || $new) && $save) { + $formvars=array(); foreach($fm_struct as $key=>$row){ list($editible,$view,$type,$title,$comment)=$row; if ($editible != 0){ $func="_inp_".$type; $val=safepost($key); - if ($type!="password" || substr($val,0,1)!="*"){ - $_vals[]=$key."='".escape_string( - function_exists($func) - ?$func($val) - :$val)."'"; - } + if ($type!="password" || strlen($val) > 0) { # skip on empty (aka unchanged) password + $formvars[$key]= escape_string( function_exists($func) ?$func($val) :$val); + } } } - $sql="UPDATE fetchmail SET ".implode(",",$_vals).",returned_text='' WHERE id=".$edit; - $res= db_query ($sql); + $formvars['id'] = $edit; # results in 0 on $new + + if (!in_array($formvars['mailbox'], $fm_defaults['mailbox'])) { + flash_error($PALANG['pFetchmail_invalid_mailbox']); + $save = 0; + } + if ($formvars['src_server'] == '') { + flash_error($PALANG['pFetchmail_server_missing']); + # TODO: validate domain name + $save = 0; + } + if (empty($formvars['src_user']) ) { + flash_error($PALANG['pFetchmail_user_missing']); + $save = 0; + } + if ($new && empty($formvars['src_password']) ) { + flash_error($PALANG['pFetchmail_password_missing']); + $save = 0; + } + + if ($save) { + if ($new) { + $sql="INSERT fetchmail (".implode(",",escape_string(array_keys($formvars))).") VALUES ('".implode("','",escape_string($formvars))."')"; + } else { # $edit + foreach(array_keys($formvars) as $key) { + $formvars[$key] = escape_string($key) . "='" . escape_string($formvars[$key]) . "'"; + } + $sql="UPDATE fetchmail SET ".implode(",",$formvars).",returned_text='', date=NOW() WHERE id=".$edit; + } + $result = db_query ($sql); + if ($result['rows'] != 1) + { + flash_error($PALANG['pFetchmail_database_save_error']); + } else { + flash_info($PALANG['pFetchmail_database_save_success']); + $edit = 0; $new = 0; # display list after saving + } + } else { + $formvars['src_password'] = ''; # never display password + } + +} elseif ($edit) { + $formvars = $edit_row; + $formvars['src_password'] = ''; +} elseif ($new) { + foreach (array_keys($fm_struct) as $value) { + if (isset($fm_defaults[$value])) { + $formvars[$value] = $fm_defaults[$value]; + } else { + $formvars[$value] = ''; + } + } } -elseif($delete){ - db_query ("delete from fetchmail WHERE id=".$edit); - $edit=0; -} -elseif ($new){ - $_keys=array(); - $_vals=array(); - foreach($fm_defaults as $key=>$val){ - $_keys[]=$key; - $_vals[]="'".(is_array($val)?$val[0]:$val)."'"; - } - $sql="INSERT fetchmail (".implode(",",escape_string($_keys)).") VALUES (".implode(",",escape_string($_vals)).")"; - $res= db_query ($sql); - $sql="SELECT id FROM fetchmail order by id desc limit 1"; - $res= db_query ($sql); - list($edit)=mysql_fetch_row($res['result']); -} -$res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM fetchmail order by id desc"); -if ($res['rows'] > 0){ - while ($row = db_array ($res['result'])){ - $tFmail[] = $row; - } +if ($edit + $new == 0) { # display list + $res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM fetchmail order by id desc"); + if ($res['rows'] > 0) { + while ($row = db_array ($res['result'])) { + $tFmail[] = $row; + } + } } function _inp_num($val){ @@ -178,4 +250,5 @@ include ("./templates/fetchmail.tpl"); include ("./templates/footer.tpl"); +/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/bg.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Íå ìîãà äà èçòðèÿ çàïèñà '; +$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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_result_success'] = 'Âàøèÿò àâòîìàòè÷åí îòãîâîð áåøå ïðåìàõíàò!'; $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; @@ -346,5 +354,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/ca.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -72,6 +72,7 @@ $PALANG['pOverview_get_modified'] = 'Última Modificació'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -318,6 +319,13 @@ $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Imposible actualitzar la configuració de la seva resposta automàtica!</span>'; $PALANG['pUsersVacation_result_success'] = 'La seva resposta automàtica ha estat esborrada!'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; @@ -346,5 +354,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/cn.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = '最后修改日期'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">不能删除本记录'; +$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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_result_success'] = '你的自动回复已经关闭!'; $PALANG['pCreate_dbLog_createmailbox'] = '新建邮箱'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = '新建别名'; $PALANG['pDelete_dbLog_deletealias'] = '删除别名'; $PALANG['pDelete_dbLog_deletemailbox'] = '邮件邮箱'; @@ -346,5 +354,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/cs.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -76,6 +76,7 @@ $PALANG['pOverview_get_modified'] = 'Naposledy změněno'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Nelze smazat položku '; +$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $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_alias_error'] = '<span class="error_msg">Nelze odstranit přesměrování '; @@ -322,6 +323,13 @@ EOM; $PALANG['pUsersVacation_button_away'] = 'Odjet pryč'; $PALANG['pUsersVacation_button_back'] = 'Vrátit se'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nepodařilo se upravit nastavení!</span>'; $PALANG['pUsersVacation_result_success'] = 'Nastavení bylo upraveno!'; @@ -356,5 +364,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/da.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Senest rettet'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan ikke slette denne post '; +$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere dine autosvar indstillinger!</span>'; $PALANG['pUsersVacation_result_success'] = 'Dit autosvar er fjernet!'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; @@ -347,5 +355,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/de.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -74,6 +74,7 @@ $PALANG['pOverview_get_modified'] = 'Zuletzt verändert'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Alias konnte nicht gelöscht werden '; @@ -355,8 +356,15 @@ $PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt"; $PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: '; - $PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag'; +$PALANG['pFetchmail_database_save_error'] = 'Eintrag konnte nicht in der Datenbank gespeichert werden!'; +$PALANG['pFetchmail_database_save_success'] = 'Eintrag wurde in der Datenbank gespeichert'; +$PALANG['pFetchmail_error_invalid_id'] = 'Kein Eintrag mit ID %s gefunden!'; +$PALANG['pFetchmail_invalid_mailbox'] = 'Ungültiges Postfach!'; +$PALANG['pFetchmail_server_missing'] = 'Bitte geben Sie den Namen des Servers ein!'; +$PALANG['pFetchmail_user_missing'] = 'Bitte geben Sie den Benutzernamen ein!'; +$PALANG['pFetchmail_password_missing'] = 'Bitte geben Sie das Passwort ein!'; -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/en.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -76,6 +76,7 @@ $PALANG['pOverview_get_modified'] = 'Last Modified'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Unable to delete alias '; @@ -357,7 +358,14 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; $PALANG['pFetchmail_new_entry'] = 'New entry'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; - -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/es.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -72,6 +72,7 @@ $PALANG['pOverview_get_modified'] = 'Última Modificación'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Imposible borrar el registro '; +$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">Este dominio no le pertenece '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -318,6 +319,13 @@ $PALANG['pUsersVacation_button_back'] = 'De vuelta'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">¡Imposible actualizar la configuración de su respuesta automática!</span>'; $PALANG['pUsersVacation_result_success'] = '¡Su respuesta automática ha sido borrada!'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; $PALANG['pCreate_dbLog_createalias'] = 'create alias'; @@ -347,5 +355,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/et.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Viimati muudetud'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_button_away'] = 'Olen eemal alates'; $PALANG['pUsersVacation_button_back'] = 'Tulen tagasi'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Automaatse vastuse uuendamine ebaõnnestus!</span>'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pUsersVacation_result_success'] = 'Automaatne vastus on eemaldatud!'; $PALANG['pCreate_dbLog_createmailbox'] = 'postkasti loomine'; @@ -350,5 +358,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/eu.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -72,6 +72,7 @@ $PALANG['pOverview_get_modified'] = 'Azken aldaketa'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -318,6 +319,13 @@ $PALANG['pUsersVacation_result_success'] = 'Zure erantzun automatikoa borratu da!'; $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; @@ -345,5 +353,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/fi.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Viimeksi muokattu'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Tietueen poisto ei onnistu '; +$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">Tämä ei ole sinun domainisi '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; $PALANG['pCreate_dbLog_createalias'] = 'create alias'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; @@ -345,5 +353,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/fo.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Síðst broytt'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ Títt navn EOM; $PALANG['pUsersVacation_button_away'] = 'Burtur'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pUsersVacation_button_back'] = 'Heima'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Fái ikki broytt tínar frítíðarboð uppsetingar!</span>'; $PALANG['pUsersVacation_result_success'] = 'Títt frítíðarboð er strikað!'; @@ -351,5 +359,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/fr.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -75,6 +75,7 @@ $PALANG['pOverview_get_modified'] = 'Dernière Modification'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Impossible d\'effacer cette entrée '; +$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $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_alias_error'] = '<span class="error_msg">Impossible d\'effacer cet alias '; @@ -321,6 +322,13 @@ $PALANG['pUsersVacation_result_success'] = 'Votre réponse automatique a été enlevée!'; $PALANG['pCreate_dbLog_createmailbox'] = 'Création de compte'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'Création d\'alias'; $PALANG['pDelete_dbLog_deletealias'] = 'Suppression d\'alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'Suppression de compte'; @@ -348,5 +356,6 @@ $PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :'; $PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée'; -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/hr.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -72,6 +72,7 @@ $PALANG['pOverview_get_modified'] = 'Zadnja promjena'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -318,6 +319,13 @@ $PALANG['pUsersVacation_result_success'] = 'Obvijest o odsutnosti je uklonjena!'; $PALANG['pCreate_dbLog_createmailbox'] = 'stvori potanski ormarić'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'stvori alias'; $PALANG['pDelete_dbLog_deletealias'] = 'pobrii alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'pobrii potanski ormarić'; @@ -345,5 +353,6 @@ $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/hu.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -75,6 +75,7 @@ $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_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_alias_error'] = '<span class="error_msg">Nem sikerült törölni az alias-t '; @@ -321,6 +322,13 @@ Ez egy automatikus üzenet. EOM; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pUsersVacation_button_away'] = 'Automatikus válaszadás bekapcsolása'; $PALANG['pUsersVacation_button_back'] = 'Automatikus válaszadás kikapcsolása'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nem sikerült megváltoztatni az automatikus válasz konfigurációdat!</span>'; @@ -360,5 +368,6 @@ $PALANG['pFetchmail_new_entry'] = 'Új bejegyzés'; -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/is.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Síðast breytt'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; $PALANG['pCreate_dbLog_createalias'] = 'create alias'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; @@ -345,5 +353,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/it.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Ultima modifica'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Impossibile cancellare '; +$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">Questo dominio non è tuo '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_result_success'] = 'La tua risposta automatica è stata tolta!'; $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; @@ -346,5 +354,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/lt.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -72,6 +72,7 @@ $PALANG['pOverview_get_modified'] = 'Paskutinis keitimas'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Į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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -318,6 +319,13 @@ $PALANG['pUsersVacation_result_success'] = 'Auto atsakovas išjungtas!'; $PALANG['pCreate_dbLog_createmailbox'] = 'pašto dėžutė sukurta'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'sinonimas sukurtas'; $PALANG['pDelete_dbLog_deletealias'] = 'sinonimas pašalintas'; $PALANG['pDelete_dbLog_deletemailbox'] = 'pašto dėžutė pašalinta'; @@ -345,5 +353,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/mk.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Последна промена'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Не можам да го избришам записот '; +$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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Не можам да ги променам сетирањата за автоматскиот одговор!</span>'; $PALANG['pUsersVacation_result_success'] = 'Вашиот автоматски одговор е отстранет!'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; @@ -347,5 +355,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/nl.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Laatst bewerkt'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Mislukt te verwijderen '; +$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">Dit is niet uw domein '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_result_success'] = 'Uw automatisch beantwoorder is verwijderd.'; $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; @@ -346,5 +354,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/nn.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Sist endret'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">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_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pCreate_dbLog_createalias'] = 'opprett alias'; $PALANG['pDelete_dbLog_deletealias'] = 'slett alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'slett e-postkonto'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'endre status'; $PALANG['pEdit_dbLog_editalias'] = 'endre alias'; $PALANG['pEdit_dbLog_editmailbox'] = 'endre e-postkonto'; @@ -343,5 +351,6 @@ $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/pl.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -75,6 +75,7 @@ $PALANG['pOverview_get_modified'] = 'Ostatnio zmodyfikowany'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Nie można usunąć tego wpisu '; +$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX $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_alias_error'] = '<span class="error_msg">Nie można usunąć aliasu '; @@ -321,6 +322,13 @@ $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nie mogę zaktualizować ustawień Twojej auto odpowiedzi!</span>'; $PALANG['pUsersVacation_result_success'] = 'Twoja auto odpowiedź została usunięta!'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; @@ -349,5 +357,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/pt-br.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Última modificação'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Não foi possível apagar esse registro '; +$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">Esse domínio não é seu! '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_result_success'] = 'Sua resposta automática foi removida!'; $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; @@ -346,5 +354,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/ru.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -76,6 +76,7 @@ $PALANG['pOverview_get_modified'] = 'Последнее изменение'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Невозможно удалить запись '; +$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_alias_error'] = '<span class="error_msg">Невозможно удалить алиас '; @@ -322,6 +323,13 @@ EOM; $PALANG['pUsersVacation_button_away'] = 'Ухожу'; $PALANG['pUsersVacation_button_back'] = 'Возвращаюсь'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Невозможно изменить настройки автоответчика!</span>'; $PALANG['pUsersVacation_result_success'] = 'Ваш автоответчик был убран!'; @@ -359,5 +367,6 @@ $PALANG['pFetchmail_new_entry'] = 'Новая запись'; -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh +/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2007-10-25 12:29:38 UTC (rev 162) +++ trunk/languages/sk.lang 2007-10-25 22:59:52 UTC (rev 163) @@ -73,6 +73,7 @@ $PALANG['pOverview_get_modified'] = 'Naposledy zmenené'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Nie je možné zmazať položku '; +$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">Táto doména nie je vaša '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX @@ -319,6 +320,13 @@ $PALANG['pUsersVacation_result_success'] = 'Nastavenie bolo upravené!'; $PALANG['pCreate_dbLog_createmailbox'] = 'vytvoriť mailbox'; +$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX +$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX +$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX +$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX +$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'vytvoriť alias'; $PALANG['pDelete_dbLog_deletealias'] = 'zmazať alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'zmazať mailbox'; @@ -346,5 +354,6 @@ $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; ... [truncated message content] |