richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates service.tpl, 1.17, 1.18
cvs at kolab.org
cvs at kolab.org
Sat Feb 2 14:11:02 CET 2008
Author: richard
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv20870/php/admin/templates
Modified Files:
service.tpl
Log Message:
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue:
https://intevation.de/roundup/kolab/issue2439
Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- service.tpl 1 Feb 2008 19:59:32 -0000 1.17
+++ service.tpl 2 Feb 2008 13:11:00 -0000 1.18
@@ -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."}
More information about the commits
mailing list