summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2008-02-01 19:59:32 (GMT)
committerRichard Bos <richard@radoeka.nl>2008-02-01 19:59:32 (GMT)
commit5dd4e0f33a34ac5505f1c618942ae457c0a51880 (patch)
treeb558a040d019fc6ee51d529b378ecc3a2020b991
parentc0cdf8510eebc48b1611d67b0b32aa870934d3d2 (diff)
downloadkolab-webadmin-5dd4e0f33a34ac5505f1c618942ae457c0a51880.tar.gz
corrected sentence from:
"Reject the message with the except if" to "Reject the message, except if"
-rw-r--r--ChangeLog10
-rw-r--r--php/admin/locale/de/LC_MESSAGES/messages.po2
-rw-r--r--php/admin/locale/es/LC_MESSAGES/messages.po2
-rw-r--r--php/admin/locale/fr/LC_MESSAGES/messages.po2
-rw-r--r--php/admin/locale/it/LC_MESSAGES/messages.po2
-rw-r--r--php/admin/locale/nl/LC_MESSAGES/messages.po2
-rwxr-xr-xphp/admin/templates/service.tpl2
7 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 139ffbd..e0d59ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-01 Richard Bos <richard@radoeka.nl>
+
+ * templates/service.tpl: corrected sentence from:
+ "Reject the message with the except if" to
+ "Reject the message, except if"
+ * 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
+
2008-01-22 Thomas Arendsen Hein <thomas@intevation.de>
* www/admin/addressbook/index.php.in,
diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/php/admin/locale/de/LC_MESSAGES/messages.po
index 249c1f9..3c6d235 100644
--- a/php/admin/locale/de/LC_MESSAGES/messages.po
+++ b/php/admin/locale/de/LC_MESSAGES/messages.po
@@ -895,7 +895,7 @@ msgstr "Maßname für Nachrichten, deren Überprüfung fehlschlägt:"
#: tpl_messages.php:182
msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"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."
msgstr ""
diff --git a/php/admin/locale/es/LC_MESSAGES/messages.po b/php/admin/locale/es/LC_MESSAGES/messages.po
index b73399f..6f94a8d 100644
--- a/php/admin/locale/es/LC_MESSAGES/messages.po
+++ b/php/admin/locale/es/LC_MESSAGES/messages.po
@@ -891,7 +891,7 @@ msgstr ""
#: tpl_messages.php:182
msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"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."
msgstr ""
diff --git a/php/admin/locale/fr/LC_MESSAGES/messages.po b/php/admin/locale/fr/LC_MESSAGES/messages.po
index 0ee847b..0891907 100644
--- a/php/admin/locale/fr/LC_MESSAGES/messages.po
+++ b/php/admin/locale/fr/LC_MESSAGES/messages.po
@@ -888,7 +888,7 @@ msgstr ""
#: tpl_messages.php:182
msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"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."
msgstr ""
diff --git a/php/admin/locale/it/LC_MESSAGES/messages.po b/php/admin/locale/it/LC_MESSAGES/messages.po
index 4d7c264..f7cb33b 100644
--- a/php/admin/locale/it/LC_MESSAGES/messages.po
+++ b/php/admin/locale/it/LC_MESSAGES/messages.po
@@ -890,7 +890,7 @@ msgstr ""
#: tpl_messages.php:182
msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"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."
msgstr ""
diff --git a/php/admin/locale/nl/LC_MESSAGES/messages.po b/php/admin/locale/nl/LC_MESSAGES/messages.po
index e7ba783..db32db4 100644
--- a/php/admin/locale/nl/LC_MESSAGES/messages.po
+++ b/php/admin/locale/nl/LC_MESSAGES/messages.po
@@ -881,7 +881,7 @@ msgstr ""
#: tpl_messages.php:182
msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"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."
msgstr ""
diff --git a/php/admin/templates/service.tpl b/php/admin/templates/service.tpl
index a10cc66..6020914 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 with the 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 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/>
<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."}