From 4d0ebd7e1b9308c3f99f94bb7e770bbe374505d6 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 13 Oct 2014 20:50:22 +0000 Subject: [PATCH] vacation.php: - check that $tActiveUntil >= today and $tActiveUntil >= $tActiveFrom - update header comments - display "vacation is active" notice also to admins (based on a patch by J.Kruis @SF, https://sourceforge.net/p/postfixadmin/patches/122/ ) *.lang: - add - pVacation_until_before_today - pVacation_until_before_from - reply_once_per_day - change pUsersVacation_welcome_text to 'Auto response for %s is active!' - remove "obsolete" marker from pUsersVacation_activefrom and pUsersVacation_activeuntil, they are still used nl.lang: - translation update by J.Kruis @SF https://sourceforge.net/p/postfixadmin/patches/122/ git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1697 a1433add-5e2c-0410-b055-b7f2511e0802 --- languages/bg.lang | 9 ++-- languages/ca.lang | 9 ++-- languages/cn.lang | 9 ++-- languages/cs.lang | 9 ++-- languages/da.lang | 9 ++-- languages/de.lang | 9 ++-- languages/en.lang | 11 +++-- languages/es.lang | 9 ++-- languages/et.lang | 9 ++-- languages/eu.lang | 9 ++-- languages/fi.lang | 9 ++-- languages/fo.lang | 9 ++-- languages/fr.lang | 9 ++-- languages/hr.lang | 9 ++-- languages/hu.lang | 9 ++-- languages/is.lang | 9 ++-- languages/it.lang | 9 ++-- languages/ja.lang | 9 ++-- languages/lt.lang | 5 +- languages/mk.lang | 9 ++-- languages/nb.lang | 9 ++-- languages/nl.lang | 111 ++++++++++++++++++++++--------------------- languages/nn.lang | 9 ++-- languages/pl.lang | 9 ++-- languages/pt-br.lang | 9 ++-- languages/ru.lang | 9 ++-- languages/sk.lang | 9 ++-- languages/sl.lang | 9 ++-- languages/sv.lang | 9 ++-- languages/tr.lang | 9 ++-- languages/tw.lang | 9 ++-- vacation.php | 49 ++++++++++++------- 32 files changed, 268 insertions(+), 160 deletions(-) diff --git a/languages/bg.lang b/languages/bg.lang index 9ae2037c..4887de69 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -167,8 +167,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Разглеждане на последните 10 действия за '; @@ -284,15 +287,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Смяна на пренасочването $PALANG['pUsersMain_password'] = 'Смяна на настоящата парола.'; $PALANG['pUsersVacation_welcome'] = 'Автоматичен отговор.'; -$PALANG['pUsersVacation_welcome_text'] = 'Вие вече си имате конфигриран автоматичен отговор!'; +$PALANG['pUsersVacation_welcome_text'] = 'Вие вече си имате конфигриран автоматичен отговор! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; # XXX $PALANG['message'] = 'Текст'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << до . При спешност можете да се свържете с . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index e64d479d..3d0abd7b 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -165,8 +165,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Veure les últimes 10 accions per '; @@ -283,15 +286,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Canvïi la seva redirecció de correu.'; $PALANG['pUsersMain_password'] = 'Canvïi la seva contrasenya.'; $PALANG['pUsersVacation_welcome'] = 'Resposta automàtica.'; -$PALANG['pUsersVacation_welcome_text'] = 'Ja disposa d\'una resposta automàtica configurada!'; +$PALANG['pUsersVacation_welcome_text'] = 'Ja disposa d\'una resposta automàtica configurada! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Fora de la feina'; $PALANG['message'] = 'Cos'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << fins al . Per assumptes urgents pot contactar amb mi a . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index 327b5212..7538b82d 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -166,8 +166,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = '查看最新的10项操作日志 域名: '; @@ -283,15 +286,15 @@ $PALANG['pUsersMain_edit_alias'] = '修改邮箱转发.'; $PALANG['pUsersMain_password'] = '修改当前密码.'; $PALANG['pUsersVacation_welcome'] = '自动回复.'; -$PALANG['pUsersVacation_welcome_text'] = '你已经设置了自动回复!'; +$PALANG['pUsersVacation_welcome_text'] = '你已经设置了自动回复! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = '我现在无法回信'; $PALANG['message'] = '内容'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << 到 这段时间内暂时无法回信. 如果你有急事请与 联系. EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = '改变活动状态'; diff --git a/languages/cs.lang b/languages/cs.lang index 4e1d4883..d06daef4 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -173,8 +173,11 @@ $PALANG['pVacation_result_added'] = 'Automatická odpověd byla zapnuta! (%s)'; $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Prohlížet 10 posledních akcí pro '; @@ -292,15 +295,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Nastavit / změnít přesměrování'; $PALANG['pUsersMain_password'] = 'Změnit heslo'; $PALANG['pUsersVacation_welcome'] = 'Automatická odpověď'; -$PALANG['pUsersVacation_welcome_text'] = 'Již máte nastavenou automatickou odpověď!'; +$PALANG['pUsersVacation_welcome_text'] = 'Již máte nastavenou automatickou odpověď! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Dovolená'; $PALANG['message'] = 'Obsah'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << od . S neodkladnými zprávami prosím kontaktujte . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'změnil aktivní stav'; diff --git a/languages/da.lang b/languages/da.lang index 9d8f0688..c90b76db 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -173,8 +173,11 @@ $PALANG['pVacation_result_added'] = 'Autosvar er aktiveret! (%s)'; # XXX Text ch $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Vis de sidste 10 poster for '; @@ -292,15 +295,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Ændr levering/videresending af email.'; $PALANG['pUsersMain_password'] = 'Ændr din nuværende adgangskode.'; $PALANG['pUsersVacation_welcome'] = 'Autosvar.'; -$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar indstillet!'; +$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar indstillet! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede'; $PALANG['message'] = 'Meddelelse'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << til . I nødstilfælde kan kontaktes. EOM; -$PALANG['pUsersVacation_activefrom'] = 'Aktiv fra'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Aktiv til'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Aktiv fra'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Aktiv til'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'ændr aktivtilstand'; diff --git a/languages/de.lang b/languages/de.lang index 5ff5bcd8..4b9e3119 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -170,8 +170,11 @@ $PALANG['pVacation_result_added'] = 'Automatische Antwort für %s wurde aktivier $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Zeit in Sekunden'; +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Einmal antworten'; $PALANG['reply_every_mail'] = 'Jede Mail beantworten'; +$PALANG['reply_once_per_day'] = 'Einmal pro Tag antworten'; $PALANG['reply_once_per_week'] = 'Einmal pro Woche antworten'; $PALANG['pViewlog_welcome'] = 'Zeigt die letzten 10 Aktionen für '; @@ -289,7 +292,7 @@ $PALANG['pUsersMain_edit_alias'] = 'Ändern Sie Ihre Weiterleitung.'; $PALANG['pUsersMain_password'] = 'Ändern Sie Ihr Passwort.'; $PALANG['pUsersVacation_welcome'] = 'Automatische Antwort.'; -$PALANG['pUsersVacation_welcome_text'] = 'Sie haben schon eine Automatische Antwort konfiguriert!'; +$PALANG['pUsersVacation_welcome_text'] = 'Automatische Antwort für %s ist aktiv!'; $PALANG['pUsersVacation_subject_text'] = 'Ich bin weg...'; $PALANG['message'] = 'Nachricht'; $PALANG['pUsersVacation_body_text'] = << bis nicht zu Hause / im Büro. In dringenden Fällen setzen Sie sich bitte mit in Verbindung. Vielen Dank für Ihr Verständnis. EOM; -$PALANG['pUsersVacation_activefrom'] = 'Aktiv ab dem'; # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Aktiv bis zum'; # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Aktiv ab dem'; +$PALANG['pUsersVacation_activeuntil'] = 'Aktiv bis zum'; $PALANG['pEdit_dbLog_editactive'] = 'Aktiv-Status ändern'; diff --git a/languages/en.lang b/languages/en.lang index 542817da..9e11ee1c 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -171,9 +171,12 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; $PALANG['pVacation_reply_type'] = 'Choice of reply'; $PALANG['pVacation_reply_delay_time'] = 'Interval time'; $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; $PALANG['reply_once'] = 'Reply once'; $PALANG['reply_every_mail'] = 'Reply on every mail'; -$PALANG['reply_once_per_week'] = 'Reply once per week'; +$PALANG['reply_once_per_day'] = 'Reply once a day'; +$PALANG['reply_once_per_week'] = 'Reply once a week'; $PALANG['pViewlog_welcome'] = 'View the last 10 actions for '; $PALANG['pViewlog_timestamp'] = 'Timestamp'; @@ -290,15 +293,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Change your email forwarding.'; $PALANG['pUsersMain_password'] = 'Change your current password.'; $PALANG['pUsersVacation_welcome'] = 'Auto Response.'; -$PALANG['pUsersVacation_welcome_text'] = 'You already have an auto response configured!'; +$PALANG['pUsersVacation_welcome_text'] = 'Auto response for %s is active!'; $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; $PALANG['message'] = 'Message'; $PALANG['pUsersVacation_body_text'] = << until . For urgent matters you can contact . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; $PALANG['pEdit_dbLog_editactive'] = 'change active state'; diff --git a/languages/es.lang b/languages/es.lang index ccc01038..588636d6 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -167,8 +167,11 @@ $PALANG['pVacation_result_added'] = '¡Autorespuesta habilitada! (%s)'; # XXX Te $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Ver las últimas 10 acciones para '; @@ -285,15 +288,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Cambie su redirección de correo.'; $PALANG['pUsersMain_password'] = 'Cambie su contraseña.'; $PALANG['pUsersVacation_welcome'] = 'Respuesta automática.'; -$PALANG['pUsersVacation_welcome_text'] = '¡Ya dispone de una respuesta automática configurada!'; +$PALANG['pUsersVacation_welcome_text'] = '¡Ya dispone de una respuesta automática configurada! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Fuera del trabajo'; $PALANG['message'] = 'Mensaje'; $PALANG['pUsersVacation_body_text'] = << hasta . Para asuntos urgentes, puede contactar conmigo en . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'cambiar estado activo'; diff --git a/languages/et.lang b/languages/et.lang index 5c643fd8..54b41336 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -166,8 +166,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Vaata 10 viimast muudatust domeeniga '; @@ -283,7 +286,7 @@ $PALANG['pUsersMain_edit_alias'] = 'Muuda e-posti edasisaatmist.'; $PALANG['pUsersMain_password'] = 'Muuda praegust parooli.'; $PALANG['pUsersVacation_welcome'] = 'Automaatne vastus.'; -$PALANG['pUsersVacation_welcome_text'] = 'Automaatne vastus on juba seadistatud!'; +$PALANG['pUsersVacation_welcome_text'] = 'Automaatne vastus on juba seadistatud! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Kontorist väljas'; $PALANG['message'] = 'Põhitekst'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<. I will be away from until . For urgent matters you can contact . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'aktiivne staatuse muutmine'; diff --git a/languages/eu.lang b/languages/eu.lang index 9c1aee6e..438f12ea 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -164,8 +164,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Honen azken 10 ekintzak ikusi '; @@ -282,15 +285,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Alda ezazu posta helbidea.'; $PALANG['pUsersMain_password'] = 'Alda ezazu pasahitza.'; $PALANG['pUsersVacation_welcome'] = 'Erantzun automatikoa.'; -$PALANG['pUsersVacation_welcome_text'] = 'Erantzun automatiko bat konfiguratuta duzu!'; +$PALANG['pUsersVacation_welcome_text'] = 'Erantzun automatiko bat konfiguratuta duzu! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Lanetik kanpo'; $PALANG['message'] = 'Gorputza'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<-tik arte kanpoan egongo naiz. Larrialdiko gaientzat, hemen kontakta dezakezu nirekin. EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX diff --git a/languages/fi.lang b/languages/fi.lang index ea8def4e..ce0cde9f 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -166,8 +166,11 @@ $PALANG['pVacation_result_added'] = 'Automaattivastaus päällä! (%s)'; # XXX T $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Näytä viimeiset kymmenen tapahtumaa domainille '; @@ -283,15 +286,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Muuta uudelleenohjauksen osoitetta.'; $PALANG['pUsersMain_password'] = 'Vaihda nykyinen salasanasi.'; $PALANG['pUsersVacation_welcome'] = 'Automaattivastaus.'; -$PALANG['pUsersVacation_welcome_text'] = 'Sinulla on jo automaattivastaus päällä!'; +$PALANG['pUsersVacation_welcome_text'] = 'Sinulla on jo automaattivastaus päällä! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Lomalla'; $PALANG['message'] = 'Viesti'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << välisen ajan. Kiireellisissä asioissa voitte ottaa yhteyttä . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'vaihda aktiivisuus tilaa'; diff --git a/languages/fo.lang b/languages/fo.lang index 80c86da7..50b69166 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -166,8 +166,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Vís seinastu 10 hendingarnar fyri '; @@ -283,7 +286,7 @@ $PALANG['pUsersMain_edit_alias'] = 'Send tín post víðari til aðra adressu.'; $PALANG['pUsersMain_password'] = 'Broyt títt núverandi loyniorð.'; $PALANG['pUsersVacation_welcome'] = 'Sjálvvirkið svar.'; -$PALANG['pUsersVacation_welcome_text'] = 'Tú hevur longu eini frítíðarboð uppsett!'; +$PALANG['pUsersVacation_welcome_text'] = 'Tú hevur longu eini frítíðarboð uppsett! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; $PALANG['message'] = 'Boð'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<. Títt navn EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX diff --git a/languages/fr.lang b/languages/fr.lang index a7ba035e..6097ca7e 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -167,8 +167,11 @@ $PALANG['pVacation_result_added'] = 'Le répondeur de %s a été activé!'; $PALANG['pVacation_reply_type'] = 'Type de réponse'; $PALANG['pVacation_reply_delay_time'] = 'Intervalle'; $PALANG['pVacation_reply_delay_time_text'] = 'Durée en secondes'; +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Répondre une fois'; $PALANG['reply_every_mail'] = 'Répondre à chaque message'; +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Répondre une fois par semaine'; $PALANG['pViewlog_welcome'] = 'Visualiser les 10 dernières actions pour '; @@ -285,15 +288,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Modifier vos transferts de courriel.'; $PALANG['pUsersMain_password'] = 'Changer votre mot de passe.'; $PALANG['pUsersVacation_welcome'] = 'Répondeur Automatique.'; -$PALANG['pUsersVacation_welcome_text'] = 'Votre repondeur automatique est déjà configuré!'; +$PALANG['pUsersVacation_welcome_text'] = 'Votre repondeur automatique est déjà configuré! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Notification d\'absence'; $PALANG['message'] = 'Message'; $PALANG['pUsersVacation_body_text'] = << do sam odsutan. Za hitne stvari molim vas da kontaktirate . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'promijeni stanje aktivnosti'; diff --git a/languages/hu.lang b/languages/hu.lang index 9fb21f99..9bd0be61 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -170,8 +170,11 @@ $PALANG['pVacation_result_added'] = 'Az automatikus válasz engedélyezve! (%s)' $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Az utolsó 10 esemény megtekintése: '; @@ -289,7 +292,7 @@ $PALANG['pUsersMain_edit_alias'] = 'Email átirányítás beállítása.'; $PALANG['pUsersMain_password'] = 'Jelenlegi jelszó megváltoztatása.'; $PALANG['pUsersVacation_welcome'] = 'Automatikus válasz.'; -$PALANG['pUsersVacation_welcome_text'] = 'Már van be állítva automatikus válasz !'; +$PALANG['pUsersVacation_welcome_text'] = 'Már van be állítva automatikus válasz ! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Sajnálom, de jelenleg nem vagyok email közelben!'; $PALANG['message'] = 'Üzenet'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << og til . I will be away from until . Ef mikið liggur við, geturðu haft samaband við . For urgent matters you can contact . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX diff --git a/languages/it.lang b/languages/it.lang index 0b69ad8d..1a2de9c9 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -167,8 +167,11 @@ $PALANG['pVacation_result_added'] = 'Autorisponditore abilitato! (%s)'; # XXX Te $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Elenca gli ultimi dieci eventi per '; @@ -284,15 +287,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Cambia le impostazioni di inoltro della tua $PALANG['pUsersMain_password'] = 'Cambia la tua password corrente.'; $PALANG['pUsersVacation_welcome'] = 'Autorisponditore.'; -$PALANG['pUsersVacation_welcome_text'] = 'Hai già un autorisponditore configurato'; +$PALANG['pUsersVacation_welcome_text'] = 'Hai già un autorisponditore configurato (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Assente dall\'ufficio'; $PALANG['message'] = 'Corpo'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << al . Per problemi urgenti potete contattare . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'attiva o disattiva'; diff --git a/languages/ja.lang b/languages/ja.lang index 47415a15..9f2fffb3 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -170,8 +170,11 @@ $PALANG['pVacation_result_added'] = '自動応答を設定しました。 (%s)'; $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = '過去10個のアクション '; @@ -289,15 +292,15 @@ $PALANG['pUsersMain_edit_alias'] = '転送設定を変更します。'; $PALANG['pUsersMain_password'] = 'パスワードを変更します。'; $PALANG['pUsersVacation_welcome'] = '自動応答'; -$PALANG['pUsersVacation_welcome_text'] = '既に自動応答を構成してあります。'; +$PALANG['pUsersVacation_welcome_text'] = '既に自動応答を構成してあります。 (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = '不在'; $PALANG['message'] = '本文'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << から まで不在です。 緊急事項は まで連絡してください。 EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX diff --git a/languages/lt.lang b/languages/lt.lang index 1256381f..fb7def28 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -167,8 +167,11 @@ $PALANG['pVacation_result_added'] = 'Atostogų pranešimas įjungtas!'; $PALANG['pVacation_reply_type'] = 'Atsakymo tipas'; $PALANG['pVacation_reply_delay_time'] = 'Intervalas'; $PALANG['pVacation_reply_delay_time_text'] = 'Laikas sekundėmis'; +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Peržiūrėti paskutinius 10 vartotojo veiksmų '; @@ -284,7 +287,7 @@ $PALANG['pUsersMain_edit_alias'] = 'Pakeisti laiškų peradresavimą.'; $PALANG['pUsersMain_password'] = 'Pakeisti slaptažodį.'; $PALANG['pUsersVacation_welcome'] = 'Automatinis (atostogų) atsakymas.'; -$PALANG['pUsersVacation_welcome_text'] = 'Auto atsakiklis jau nustatytas!'; +$PALANG['pUsersVacation_welcome_text'] = 'Auto atsakiklis jau nustatytas! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Esu išvykęs'; $PALANG['message'] = 'Žinutė'; $PALANG['pUsersVacation_body_text'] = << до . За итни случаи контактирајте со . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX diff --git a/languages/nb.lang b/languages/nb.lang index 5c306979..73cfce1d 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -167,8 +167,11 @@ $PALANG['pVacation_result_added'] = 'Automatisk svar har blitt aktivert! (%s)'; $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Vis de 10 siste handlingene for '; @@ -284,15 +287,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Endre videresending.'; $PALANG['pUsersMain_password'] = 'Endre passordet ditt.'; $PALANG['pUsersVacation_welcome'] = 'Automatisk svar.'; -$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar aktivert!'; +$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar aktivert! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Fraværsmelding'; $PALANG['message'] = 'Meldingstekst'; # XXX check text - should be 'Message' $PALANG['pUsersVacation_body_text'] = << tot . Voor belangrijke punten kunt u contact opnemen met . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Actief vanaf'; # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Actief t/m'; # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Actief vanaf'; # -> NOT OBSOLETE <- +$PALANG['pUsersVacation_activeuntil'] = 'Actief t/m'; # -> NOT OBSOLETE <- $PALANG['pEdit_dbLog_editactive'] = 'status verandert'; @@ -309,11 +312,11 @@ $PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren '; $PALANG['pStatus_custom'] = 'Bezorgen op '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['password_too_short'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten"; -$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX -$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX +$PALANG['password_no_characters'] = "Je wachtwoord moet minimaal %s karakter(s) bevatten."; # XXX +$PALANG['password_no_digits'] = "Je wachtwoord moet minimaal %s getal(len) bevatten."; # XXX $PALANG['pInvalidDomainRegex'] = "Ongeldig domein naam %s"; $PALANG['pInvalidDomainDNS'] = "Ongeldig domein %s"; -$PALANG['pInvalidMailRegex'] = "Ongeldig email adres %s"; # XXX text change to: "Invalid email address %s, fails regexp check" +$PALANG['pInvalidMailRegex'] = "Ongeldig email adres %s komt niet door de limietcheck"; # XXX text change to: "Invalid email address %s, fails regexp check" $PALANG['pFetchmail_welcome'] = 'Haal mail op voor:'; $PALANG['pFetchmail_new_entry'] = 'Nieuw item'; $PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!'; @@ -335,7 +338,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen'; $PALANG['pFetchmail_field_keep'] = 'behouden'; $PALANG['pFetchmail_field_protocol'] = 'protocol'; $PALANG['pFetchmail_field_usessl'] = 'SSL actief'; -$PALANG['pFetchmail_field_sslcertck'] = 'SSL certificate check'; # XXX +$PALANG['pFetchmail_field_sslcertck'] = 'SSL certificate controle'; # XXX $PALANG['pFetchmail_field_sslcertpath'] = 'SSL path to certificates'; # XXX $PALANG['pFetchmail_field_sslfingerprint'] = 'SSL fingerprint (md5)'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'extra opties'; diff --git a/languages/nn.lang b/languages/nn.lang index 39adbe75..a4f33226 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -165,8 +165,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Vis de 10 siste handlingene '; @@ -283,15 +286,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Endre videresending.'; $PALANG['pUsersMain_password'] = 'Endre passord.'; $PALANG['pUsersVacation_welcome'] = 'Automatisk Svar.'; -$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar!'; +$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede'; $PALANG['message'] = 'Melding'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << til . For viktige henvendelser kan du kontakte . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'endre status'; diff --git a/languages/pl.lang b/languages/pl.lang index 798cf439..4d750907 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -169,8 +169,11 @@ $PALANG['pVacation_result_added'] = 'Auto odpowiedź została dodana! (%s)'; # X $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Pokaż 10 ostatnich działań dla '; @@ -288,7 +291,7 @@ $PALANG['pUsersMain_password'] = 'Zmień aktualne hasło.'; $PALANG['pUsersVacation_welcome'] = 'Automatyczną odpowiedź.'; -$PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną automatyczną odpowiedź!'; +$PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną automatyczną odpowiedź! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Poza biurem'; $PALANG['message'] = 'Wiadomość'; @@ -296,8 +299,8 @@ $PALANG['pUsersVacation_body_text'] = << do . W pilnych sprawach proszę się kontaktować z . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'zmień aktywny stan'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index d4815954..b9bd9b8d 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -172,8 +172,11 @@ $PALANG['pVacation_result_added'] = 'Resposta automática habilitada! (%s)'; # X $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Últimas 10 ações para '; @@ -291,15 +294,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Defina endereços de email para redirecionam $PALANG['pUsersMain_password'] = 'Altere a senha de sua conta.'; $PALANG['pUsersVacation_welcome'] = 'Configuração de resposta automática.'; -$PALANG['pUsersVacation_welcome_text'] = 'Você já possui uma resposta automática configurada!'; +$PALANG['pUsersVacation_welcome_text'] = 'Você já possui uma resposta automática configurada! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Ausente'; $PALANG['message'] = 'Corpo da Mensagem'; # XXX check text - should be 'Message' $PALANG['pUsersVacation_body_text'] = << até . Em caso de urgência, favor contatar . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'habilitar/desabilitar'; diff --git a/languages/ru.lang b/languages/ru.lang index 99853619..155d7398 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -172,8 +172,11 @@ $PALANG['pVacation_result_added'] = 'Автоответчик для %s вклю $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Просмотреть 10 последних действий для '; @@ -291,15 +294,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Изменить перенаправлен $PALANG['pUsersMain_password'] = 'Изменить текущий пароль.'; $PALANG['pUsersVacation_welcome'] = 'Автоответчик.'; -$PALANG['pUsersVacation_welcome_text'] = 'У вас уже есть настроенный автоответчик!'; +$PALANG['pUsersVacation_welcome_text'] = 'У вас уже есть настроенный автоответчик! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Вне офиса'; $PALANG['message'] = 'Сообщение'; $PALANG['pUsersVacation_body_text'] = << по <дату>. По срочным вопросам вы можете обратиться к <контактному лицу>. EOM; -$PALANG['pUsersVacation_activefrom'] = 'Активен с'; # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Активен по'; # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Активен с'; +$PALANG['pUsersVacation_activeuntil'] = 'Активен по'; $PALANG['pEdit_dbLog_editactive'] = 'изменение статуса активности'; diff --git a/languages/sk.lang b/languages/sk.lang index 98098240..64069c4b 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -167,8 +167,11 @@ $PALANG['pVacation_result_added'] = 'Automatická odpoveď bola nastavená! (%s) $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Prehľad 10 posledných akcií pre '; @@ -284,15 +287,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Nastaviť/zmeniť presmerovanie'; $PALANG['pUsersMain_password'] = 'Zmeniť heslo'; $PALANG['pUsersVacation_welcome'] = 'Automatická odpoveď'; -$PALANG['pUsersVacation_welcome_text'] = 'Automatická odpoveď je zapnutá!'; +$PALANG['pUsersVacation_welcome_text'] = 'Automatická odpoveď je zapnutá! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Dovolenka'; $PALANG['message'] = 'Správa'; # XXX check text - should be 'Message' $PALANG['pUsersVacation_body_text'] = << od . S neodkladnými vecami kontaktujte . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Aktívna od'; # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Aktívna do'; # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Aktívna od'; +$PALANG['pUsersVacation_activeuntil'] = 'Aktívna do'; $PALANG['pEdit_dbLog_editactive'] = 'zmena aktivity'; diff --git a/languages/sl.lang b/languages/sl.lang index ba5d02b3..022069ea 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -166,8 +166,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Seznam zadnjih 10 operacij za '; @@ -283,15 +286,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Nastavite preusmeritev na drug e-poštni nas $PALANG['pUsersMain_password'] = 'Spremenite geslo.'; $PALANG['pUsersVacation_welcome'] = 'Tukaj lahko nastavite obvestilo o odsotnosti.'; -$PALANG['pUsersVacation_welcome_text'] = 'Obvestilo o odsotnosti imate že nastavljeno!'; +$PALANG['pUsersVacation_welcome_text'] = 'Obvestilo o odsotnosti imate že nastavljeno! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Odsotnost'; $PALANG['message'] = 'Besedilo'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << do sem odsoten. Za nujne zadeve prosim kontaktirajte . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'spremeni stanje aktivnosti'; diff --git a/languages/sv.lang b/languages/sv.lang index 136099f2..fb1a0bf5 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -168,8 +168,11 @@ $PALANG['pVacation_result_added'] = 'Autosvar meddelande har aktiverats! (%s)'; $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Visa dom senaste 10 åtgärderna för '; @@ -285,15 +288,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Ändra din epost forwardadress.'; $PALANG['pUsersMain_password'] = 'Ändra ditt nuvarande lösenord.'; $PALANG['pUsersVacation_welcome'] = 'Autosvar.'; -$PALANG['pUsersVacation_welcome_text'] = 'Du har redan ett autosvar meddelande definierat!'; +$PALANG['pUsersVacation_welcome_text'] = 'Du har redan ett autosvar meddelande definierat! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; $PALANG['message'] = 'Text'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << till . För brådskande ärenden kan ni kontakta . EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'ändra aktiv status'; diff --git a/languages/tr.lang b/languages/tr.lang index 4c1be7c6..d89735d1 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -166,8 +166,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = 'Son 10 hareket:'; @@ -283,15 +286,15 @@ $PALANG['pUsersMain_edit_alias'] = 'Eposta yönlendirmenizi deðiþtirin.'; $PALANG['pUsersMain_password'] = 'þifrenizi deðiþtirin.'; $PALANG['pUsersVacation_welcome'] = 'Otomatik Cevaplama.'; -$PALANG['pUsersVacation_welcome_text'] = 'Zaten bir otomatik cevaplamanýz bulunmakta!'; +$PALANG['pUsersVacation_welcome_text'] = 'Zaten bir otomatik cevaplamanýz bulunmakta! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = 'Ofis dýþýnda'; $PALANG['message'] = 'Metin'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << tarihinden den ine burada bulunmayacaðým. Acil durumlarda lütfen a baþvurunuz. EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX diff --git a/languages/tw.lang b/languages/tw.lang index 00ace3d6..911f51f3 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -166,8 +166,11 @@ $PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # $PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX $PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX +$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set before Today'; # XXX +$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX $PALANG['reply_once'] = 'Reply once'; # XXX $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX +$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX $PALANG['pViewlog_welcome'] = '查看最新的10項操作日誌 網域名: '; @@ -283,15 +286,15 @@ $PALANG['pUsersMain_edit_alias'] = '修改郵箱轉發.'; $PALANG['pUsersMain_password'] = '修改當前密碼.'; $PALANG['pUsersVacation_welcome'] = '自動回復.'; -$PALANG['pUsersVacation_welcome_text'] = '你已經設置了自動回復!'; +$PALANG['pUsersVacation_welcome_text'] = '你已經設置了自動回復! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_subject_text'] = '我現在無法回信'; $PALANG['message'] = '內容'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << 到 這段時間內暫時無法回信. 如果你有急事請與 聯繫. EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX # obsolete -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX # obsolete +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pEdit_dbLog_editactive'] = '改變活動狀態'; diff --git a/vacation.php b/vacation.php index 4715eadc..331a8799 100644 --- a/vacation.php +++ b/vacation.php @@ -12,9 +12,11 @@ * @license GNU GPL v2 or later. * * File: edit-vacation.php - * Responsible for allowing users to update their vacation status. * - * Template File: edit-vacation.tpl + * Allows users to update their vacation status and + * admins to update the vacation status for the their users + * + * Template File: vacation.tpl * * Template Variables: * @@ -23,6 +25,7 @@ * tActiveUntil * tSubject * tBody + * tInterval_time * * Form POST \ GET Variables: * @@ -31,7 +34,6 @@ * fCancel * fChange * fBack - * fQuota * fActive */ @@ -52,7 +54,6 @@ if(authentication_has_role('admin')) { } else { $Admin_role = 0 ; -# $Return_url = "users/main.php"; $Return_url = "main.php"; authentication_require_role('user'); $fUsername = authentication_get_username(); @@ -85,26 +86,25 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { if($details != false) { $tSubject = $details['subject']; $tBody = $details['body']; - $tInterval_Time = $details['interval_time']; + $tInterval_Time = $details['interval_time']; $tActiveFrom = $details['activeFrom']; $tActiveUntil = $details['activeUntil']; } - if($vh->check_vacation() and (!$Admin_role)) { - # TODO: would also be useful for admins, but needs a text change to include the username - flash_info($PALANG['pUsersVacation_welcome_text']); + if($vh->check_vacation()) { + flash_info(sprintf($PALANG['pUsersVacation_welcome_text'],htmlentities($tUseremail))); } //set a default, reset fields for coming back selection - if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); } - if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); } + if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); } + if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); } } if ($_SERVER['REQUEST_METHOD'] == "POST") { if(isset($_POST['fCancel'])) { - header ("Location: $Return_url"); + header ("Location: $Return_url"); exit(0); } @@ -114,7 +114,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $tSubject = safepost('fSubject'); $fSubject = $tSubject; $tBody = safepost('fBody'); - $fBody = $tBody; + $fBody = $tBody; $tInterval_Time = safepost('fInterval_Time'); @@ -123,7 +123,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $tUseremail = $fUsername; - //set a default, reset fields for coming back selection + //set a default, reset fields for coming back selection if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); } if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); } @@ -137,11 +137,26 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") // the user is going away - set the goto alias and vacation table as necessary. //Set the vacation data for $fUsername + if (!empty ($fChange)) { - if(!$vh->set_away($fSubject, $fBody, $fInterval_Time, $tActiveFrom, $tActiveUntil)) { - $error = 1; - } + + ## check if ActiveUnitl is not back in time, + ## because vacation.pl will report SMTP recipient $smtp_recipient which resolves to $email does not have an active vacation (rv: $rv, email: $email)" + ## and will not send message + + if ( ($tActiveUntil >= date ("Y-m-d")) and ($tActiveUntil >= $tActiveFrom) ) { + if (!$vh->set_away($fSubject, $fBody, $fInterval_Time, $tActiveFrom, $tActiveUntil)) { + $error = 1; + } + } else { + if ( $tActiveUntil < date ("Y-m-d") ) { + flash_error($PALANG['pVacation_until_before_today']); + } else { + flash_error($PALANG['pVacation_until_before_from']); + } + $error = 1; + } } //if change, remove old one, then perhaps set new one @@ -167,7 +182,7 @@ if($error == 0) { } } else { - flash_error($PALANG['pVacation_result_error']); + flash_error(sprintf($PALANG['pVacation_result_error'],htmlentities($fUsername))); } $today = date ("Y-m-d");