summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2008-02-02 13:11:00 (GMT)
committerRichard Bos <richard@radoeka.nl>2008-02-02 13:11:00 (GMT)
commit5d387852ec456ff17ee2adc0bef8872799b6007c (patch)
treef7160fda643b9c08ae476f746ade84b5067b3885
parent5dd4e0f33a34ac5505f1c618942ae457c0a51880 (diff)
downloadkolab-webadmin-5d387852ec456ff17ee2adc0bef8872799b6007c.tar.gz
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue: https://intevation.de/roundup/kolab/issue2439
-rw-r--r--ChangeLog10
-rw-r--r--php/admin/locale/de/LC_MESSAGES/messages.po4
-rw-r--r--php/admin/locale/es/LC_MESSAGES/messages.po4
-rw-r--r--php/admin/locale/fr/LC_MESSAGES/messages.po4
-rw-r--r--php/admin/locale/it/LC_MESSAGES/messages.po4
-rw-r--r--php/admin/locale/nl/LC_MESSAGES/messages.po11
-rwxr-xr-xphp/admin/templates/service.tpl2
7 files changed, 26 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index e0d59ea..1583eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-02 Richard Bos <richard@radoeka.nl>
+
+ * templates/service.tpl: rephrased the sentence from:
+ "Reject the message ........"
+ * locale/de/LC_MESSAGES/messages.po, locale/es/LC_MESSAGES/messages.po,
+ locale/fr/LC_MESSAGES/messages.po, locale/it/LC_MESSAGES/messages.po,
+ locale/nl/LC_MESSAGES/messages.po: reflect the change
+ in templates/service.tpl see issue:
+ https://intevation.de/roundup/kolab/issue2439
+
2008-02-01 Richard Bos <richard@radoeka.nl>
* templates/service.tpl: corrected sentence from:
diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/php/admin/locale/de/LC_MESSAGES/messages.po
index 3c6d235..6e8b8cd 100644
--- a/php/admin/locale/de/LC_MESSAGES/messages.po
+++ b/php/admin/locale/de/LC_MESSAGES/messages.po
@@ -895,8 +895,8 @@ msgstr "Maßname für Nachrichten, deren Überprüfung fehlschlägt:"
#: tpl_messages.php:182
msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
"the From header so the recipient can see the potential forgery."
msgstr ""
"Nachricht zurückweisen, sofern sie nicht von außen kommt, aber eine From-"
diff --git a/php/admin/locale/es/LC_MESSAGES/messages.po b/php/admin/locale/es/LC_MESSAGES/messages.po
index 6f94a8d..df8cae6 100644
--- a/php/admin/locale/es/LC_MESSAGES/messages.po
+++ b/php/admin/locale/es/LC_MESSAGES/messages.po
@@ -891,8 +891,8 @@ msgstr ""
#: tpl_messages.php:182
msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
"the From header so the recipient can see the potential forgery."
msgstr ""
"Rechazar el mensaje salvo que esté originado en exterior pero tenga una "
diff --git a/php/admin/locale/fr/LC_MESSAGES/messages.po b/php/admin/locale/fr/LC_MESSAGES/messages.po
index 0891907..190cbb5 100644
--- a/php/admin/locale/fr/LC_MESSAGES/messages.po
+++ b/php/admin/locale/fr/LC_MESSAGES/messages.po
@@ -888,8 +888,8 @@ msgstr ""
#: tpl_messages.php:182
msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
"the From header so the recipient can see the potential forgery."
msgstr ""
"Refuse le message sauf s'il vient de l'extérieur et possède une adresse "
diff --git a/php/admin/locale/it/LC_MESSAGES/messages.po b/php/admin/locale/it/LC_MESSAGES/messages.po
index f7cb33b..cf4a073 100644
--- a/php/admin/locale/it/LC_MESSAGES/messages.po
+++ b/php/admin/locale/it/LC_MESSAGES/messages.po
@@ -890,8 +890,8 @@ msgstr ""
#: tpl_messages.php:182
msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
"the From header so the recipient can see the potential forgery."
msgstr ""
"Rifiuta il messaggio tranne quando è stato originato all'esterno ma ha "
diff --git a/php/admin/locale/nl/LC_MESSAGES/messages.po b/php/admin/locale/nl/LC_MESSAGES/messages.po
index db32db4..3e4fead 100644
--- a/php/admin/locale/nl/LC_MESSAGES/messages.po
+++ b/php/admin/locale/nl/LC_MESSAGES/messages.po
@@ -877,14 +877,17 @@ msgstr ""
#: tpl_messages.php:181
msgid "Action to take for messages that fail the check:"
-msgstr ""
+msgstr "Welke actie uitvoeren voor berichten die de test falen"
#: tpl_messages.php:182
msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
"the From header so the recipient can see the potential forgery."
-msgstr ""
+msgstr
+"Weiger het bericht, behalve als deze van buiten komt en "
+"een From header heeft overeenkomstig met 1 van de Kolab server domeinen. In dit geval "
+"wordt de From header herschreven, zodat de ontvanger het mogelijke misbruik kan zien"
#: tpl_messages.php:183
msgid "Always reject the message."
diff --git a/php/admin/templates/service.tpl b/php/admin/templates/service.tpl
index 6020914..9c0278e 100755
--- a/php/admin/templates/service.tpl
+++ b/php/admin/templates/service.tpl
@@ -134,7 +134,7 @@
<br />
<h4>{tr msg="Action to take for messages that fail the check:"}</h4>
<input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked{/if} />
-{tr msg="Reject the message, except if it originates from the outside but has a From header that matches the Kolab server's domain. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
+{tr msg="Reject the message, except if it originates from the outside and the From header matches one of Kolab server's domains. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
<input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked{/if} />
{tr msg="Always reject the message."}
{tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}