summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-11-21 14:26:38 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-11-21 14:26:38 (GMT)
commitec721a8df6d0fc791c11624f9dad2e129163650a (patch)
tree14079c936e139c02ebbd91e2f87fdcdbec47625d
parent29fa06daee01d55bdadb10cb16599d5110457757 (diff)
downloadkolab-webadmin-ec721a8df6d0fc791c11624f9dad2e129163650a.tar.gz
Mark "Action to take for messages that fail the check" for translation
and update .po files, including translation for German.
-rw-r--r--ChangeLog11
-rw-r--r--php/admin/locale/de/LC_MESSAGES/messages.po108
-rw-r--r--php/admin/locale/es/LC_MESSAGES/messages.po106
-rw-r--r--php/admin/locale/fr/LC_MESSAGES/messages.po106
-rw-r--r--php/admin/locale/it/LC_MESSAGES/messages.po106
-rw-r--r--php/admin/locale/nl/LC_MESSAGES/messages.po106
-rwxr-xr-xphp/admin/templates/service.tpl2
7 files changed, 288 insertions, 257 deletions
diff --git a/ChangeLog b/ChangeLog
index bc3913d..5058658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,11 +2,22 @@
* www/admin/user/user.php.in: Renamed "Free/Busy future" to
"Free/Busy interval" to be consistent with the user inteface.
+
* www/admin/user/deliver.php.in, www/admin/user/forward.php.in,
www/admin/user/vacation.php.in: Don't use @bindir@ in strings
marked for translation.
+
* de/LC_MESSAGES/messages.po: Updated German translations.
+ * php/admin/templates/service.tpl,
+ php/admin/locale/de/LC_MESSAGES/messages.po,
+ php/admin/locale/es/LC_MESSAGES/messages.po,
+ php/admin/locale/fr/LC_MESSAGES/messages.po,
+ php/admin/locale/it/LC_MESSAGES/messages.po,
+ php/admin/locale/nl/LC_MESSAGES/messages.po: Mark "Action to take for
+ messages that fail the check" for translation and update .po files,
+ including translation for German.
+
2007-11-16 Thomas Arendsen Hein <thomas@intevation.de>
* php/admin/locale/de/LC_MESSAGES/messages.po: Updated German
diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/php/admin/locale/de/LC_MESSAGES/messages.po
index 875a879..c26bc60 100644
--- a/php/admin/locale/de/LC_MESSAGES/messages.po
+++ b/php/admin/locale/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Kolab-Webadmin German\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-21 14:29+0100\n"
-"PO-Revision-Date: 2007-11-21 14:56+0100\n"
+"POT-Creation-Date: 2007-11-21 15:22+0100\n"
+"PO-Revision-Date: 2007-11-21 15:23+0100\n"
"Last-Translator: Thomas Arendsen Hein <thomas@intevation.de>\n"
"Language-Team: Kolab development coordination <kolab-devel@kolab.org>\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgid "The address with DN"
msgstr "Die Adresse mit DN"
#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:130 tpl_messages.php:196 tpl_messages.php:214
msgid "has been deleted"
msgstr "wurde gelöscht"
@@ -33,29 +33,29 @@ msgid "(only external addresses without a kolab user account)"
msgstr "(nur externe Adresse ohne Kolab-Benutzerkonto)"
#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:198
-#: tpl_messages.php:221 ../../../www/admin/addressbook/index.php.in:123
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:199
+#: tpl_messages.php:222 ../../../www/admin/addressbook/index.php.in:123
#: ../../../www/admin/user/index.php.in:185
msgid "Name"
msgstr "Name"
#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:179 tpl_messages.php:191 tpl_messages.php:201
-#: tpl_messages.php:224
+#: tpl_messages.php:179 tpl_messages.php:192 tpl_messages.php:202
+#: tpl_messages.php:225
msgid "Action"
msgstr "Aktion"
#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:203 tpl_messages.php:226
+#: tpl_messages.php:204 tpl_messages.php:227
msgid "Modify"
msgstr "Verändern"
#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:180 tpl_messages.php:192 tpl_messages.php:204
-#: tpl_messages.php:227 ../../../www/admin/addressbook/addr.php.in:283
+#: tpl_messages.php:180 tpl_messages.php:193 tpl_messages.php:205
+#: tpl_messages.php:228 ../../../www/admin/addressbook/addr.php.in:283
#: ../../../www/admin/administrator/admin.php.in:313
#: ../../../www/admin/distributionlist/list.php.in:300
#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
@@ -65,19 +65,19 @@ msgstr "Verändern"
msgid "Delete"
msgstr "Löschen"
-#: tpl_messages.php:11 tpl_messages.php:216 tpl_messages.php:229
+#: tpl_messages.php:11 tpl_messages.php:217 tpl_messages.php:230
msgid "[ ALL ]"
msgstr "[ ALLE ]"
-#: tpl_messages.php:12 tpl_messages.php:217 tpl_messages.php:230
+#: tpl_messages.php:12 tpl_messages.php:218 tpl_messages.php:231
msgid "[ OTHER ]"
msgstr "[ ANDERE ]"
-#: tpl_messages.php:13 tpl_messages.php:218 tpl_messages.php:231
+#: tpl_messages.php:13 tpl_messages.php:219 tpl_messages.php:232
msgid "Filter:"
msgstr "Filter:"
-#: tpl_messages.php:14 tpl_messages.php:219 tpl_messages.php:232
+#: tpl_messages.php:14 tpl_messages.php:220 tpl_messages.php:233
msgid "Filter"
msgstr "Filter"
@@ -315,7 +315,7 @@ msgstr "Normale Nachrichten an den Ordner zustellen"
#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:157
#: tpl_messages.php:161 tpl_messages.php:164 tpl_messages.php:167
#: tpl_messages.php:170 tpl_messages.php:173 tpl_messages.php:176
-#: tpl_messages.php:188 tpl_messages.php:242
+#: tpl_messages.php:189 tpl_messages.php:243
msgid "Update"
msgstr "Aktualisieren"
@@ -900,7 +900,7 @@ msgstr "Domänen"
msgid "Domain"
msgstr "Domäne"
-#: tpl_messages.php:181 tpl_messages.php:193
+#: tpl_messages.php:181 tpl_messages.php:194
msgid "Add"
msgstr "Hinzufügen"
@@ -923,6 +923,10 @@ msgstr ""
"obigen Überprüfungen verwenden."
#: tpl_messages.php:185
+msgid "Action to take for messages that fail the check:"
+msgstr "Maßname für Nachrichten, deren Überprüfung fehlschlägt:"
+
+#: tpl_messages.php:186
msgid ""
"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 "
@@ -933,11 +937,11 @@ msgstr ""
"diesem Fall die From-Kopfzeile umschreiben, damit der Empfänger die mögliche "
"Fälschung erkennen kann."
-#: tpl_messages.php:186
+#: tpl_messages.php:187
msgid "Always reject the message."
msgstr "Die Nachricht immer ablehnen."
-#: tpl_messages.php:187
+#: tpl_messages.php:188
msgid ""
"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 "
@@ -948,47 +952,47 @@ msgstr ""
"der Absender über ein Konto auf diesem Server verfügt. Dies kann "
"beispielsweise bei Nachrichtenlisten zu Problemen führen."
-#: tpl_messages.php:189
+#: tpl_messages.php:190
msgid "Kolab Hostnames (for Master and Slaves)"
msgstr "Kolab-Rechnernamen (für Master- und Slaveserver)"
-#: tpl_messages.php:190
+#: tpl_messages.php:191
msgid "Host"
msgstr "Host"
-#: tpl_messages.php:194
+#: tpl_messages.php:195
msgid "The shared folder with DN"
msgstr "Der gemeinsam genutzte Ordner mit DN"
-#: tpl_messages.php:196
+#: tpl_messages.php:197
msgid "Back to list of shared folders"
msgstr "Zurück zur Liste der gemeinsam genutzten Ordner"
-#: tpl_messages.php:197
+#: tpl_messages.php:198
msgid "Shared folders"
msgstr "Gemeinsam genutzte Ordner"
-#: tpl_messages.php:199
+#: tpl_messages.php:200
msgid "Server"
msgstr "Server"
-#: tpl_messages.php:200 tpl_messages.php:220
+#: tpl_messages.php:201 tpl_messages.php:221
msgid "Type"
msgstr "Typ"
-#: tpl_messages.php:202
+#: tpl_messages.php:203
msgid "Folder deleted, awaiting cleanup..."
msgstr "Ordner gelöscht, warte auf Aufräumaktion..."
-#: tpl_messages.php:205 tpl_messages.php:247
+#: tpl_messages.php:206 tpl_messages.php:248
msgid "Welcome to the Kolab administration interface"
msgstr "Willkommen zur Kolab-Systemadministration"
-#: tpl_messages.php:206
+#: tpl_messages.php:207
msgid "NOTE:"
msgstr "ANMERKUNG:"
-#: tpl_messages.php:207
+#: tpl_messages.php:208
msgid ""
"No account is configured to receive mail for administrative addresses. If "
"you have not yet created an account for this, "
@@ -996,52 +1000,52 @@ msgstr ""
"Es wurde kein Konto zum Empfang von Nachrichten an administrative Adressen "
"konfiguriert. Wenn Sie hierfür noch kein Konto angelegt haben, "
-#: tpl_messages.php:208
+#: tpl_messages.php:209
msgid "please do so"
msgstr "dann tun Sie das bitte jetzt"
-#: tpl_messages.php:209
+#: tpl_messages.php:210
msgid "and then go"
msgstr "und richten Sie danach"
-#: tpl_messages.php:210
+#: tpl_messages.php:211
msgid "here"
msgstr "hier"
-#: tpl_messages.php:211
+#: tpl_messages.php:212
msgid "to set up forwarding of mail to administrative email addresses."
msgstr ""
"die Weiterleitung von Nachrichten an administrative E-Mail-Adressen ein."
-#: tpl_messages.php:212
+#: tpl_messages.php:213
msgid "The user with DN"
msgstr "Der Benutzer mit DN"
-#: tpl_messages.php:214
+#: tpl_messages.php:215
msgid "Back to list of users"
msgstr "Zurück zur Liste der Benutzer"
-#: tpl_messages.php:215 tpl_messages.php:228
+#: tpl_messages.php:216 tpl_messages.php:229
msgid "Email Users"
msgstr "E-Mail-Benutzer"
-#: tpl_messages.php:222
+#: tpl_messages.php:223
msgid "E-mail"
msgstr "E-Mail"
-#: tpl_messages.php:223
+#: tpl_messages.php:224
msgid "uid"
msgstr "uid"
-#: tpl_messages.php:225
+#: tpl_messages.php:226
msgid "User Deleted, awaiting cleanup..."
msgstr "Benutzer gelöscht, warte auf Aufräumaktion..."
-#: tpl_messages.php:233
+#: tpl_messages.php:234
msgid "Vacation Notification"
msgstr "Benachrichtigungen bei Abwesenheit"
-#: tpl_messages.php:234
+#: tpl_messages.php:235
msgid ""
"Activate vacation notification (only one of vacation, forward and delivery "
"to folder can be active at any time)"
@@ -1050,47 +1054,47 @@ msgstr ""
"nur entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder "
"Zustellungsordner aktiviert sein)"
-#: tpl_messages.php:235
+#: tpl_messages.php:236
msgid "Resend notification only after"
msgstr "Benachrichtigung erst nach"
-#: tpl_messages.php:236
+#: tpl_messages.php:237
msgid "days"
msgstr "Tagen erneut senden"
-#: tpl_messages.php:237
+#: tpl_messages.php:238
msgid "Send responses for these addresses:"
msgstr "Antworten für diese Adressen schicken:"
-#: tpl_messages.php:238
+#: tpl_messages.php:239
msgid "(one address per line)"
msgstr "(Eine Adresse pro Zeile)"
-#: tpl_messages.php:239
+#: tpl_messages.php:240
msgid "Do not send vacation replies to spam messages"
msgstr "Keine Abwesenheitsbenachrichtigungen auf Spamnachrichten senden"
-#: tpl_messages.php:240
+#: tpl_messages.php:241
msgid "Only react to mail coming from domain"
msgstr "Nur auf Nachrichten reagieren, die aus dieser Domäne kommen"
-#: tpl_messages.php:241
+#: tpl_messages.php:242
msgid "(leave empty for all domains)"
msgstr "(freilassen für alle Domänen)"
-#: tpl_messages.php:243
+#: tpl_messages.php:244
msgid "Kolab2 Groupware Server Version"
msgstr "Kolab2-Groupware-Server-Version"
-#: tpl_messages.php:244
+#: tpl_messages.php:245
msgid "Kolab2 Groupware Server Component Versions"
msgstr "Versionen der Komponenten des Kolab2-Groupware-Server"
-#: tpl_messages.php:245
+#: tpl_messages.php:246
msgid "Kolab2 Patched OpenPKG Package Versions"
msgstr "Kolab2-Gepatchte-OpenPKG-Paket-Versionen"
-#: tpl_messages.php:246
+#: tpl_messages.php:247
msgid "OpenPKG Version"
msgstr "OpenPKG-Version"
diff --git a/php/admin/locale/es/LC_MESSAGES/messages.po b/php/admin/locale/es/LC_MESSAGES/messages.po
index 2e1c434..601164e 100644
--- a/php/admin/locale/es/LC_MESSAGES/messages.po
+++ b/php/admin/locale/es/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Kolab-Webadmin Spanish\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-21 14:25+0100\n"
+"POT-Creation-Date: 2007-11-21 15:22+0100\n"
"PO-Revision-Date: 2007-11-21 14:56+0100\n"
"Last-Translator: Aron Galdon <aron20012004@ya.com>\n"
"Language-Team: Kolab development coordination <kolab-devel@kolab.org>\n"
@@ -19,7 +19,7 @@ msgid "The address with DN"
msgstr "La dirección con DN"
#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:130 tpl_messages.php:196 tpl_messages.php:214
msgid "has been deleted"
msgstr "ha sido borrado"
@@ -32,29 +32,29 @@ msgid "(only external addresses without a kolab user account)"
msgstr "(sólo direcciones externas con una cuenta de usuario kolab)"
#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:198
-#: tpl_messages.php:221 ../../../www/admin/addressbook/index.php.in:123
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:199
+#: tpl_messages.php:222 ../../../www/admin/addressbook/index.php.in:123
#: ../../../www/admin/user/index.php.in:185
msgid "Name"
msgstr "Nombre"
#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:179 tpl_messages.php:191 tpl_messages.php:201
-#: tpl_messages.php:224
+#: tpl_messages.php:179 tpl_messages.php:192 tpl_messages.php:202
+#: tpl_messages.php:225
msgid "Action"
msgstr "Acción"
#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:203 tpl_messages.php:226
+#: tpl_messages.php:204 tpl_messages.php:227
msgid "Modify"
msgstr "Modificar"
#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:180 tpl_messages.php:192 tpl_messages.php:204
-#: tpl_messages.php:227 ../../../www/admin/addressbook/addr.php.in:283
+#: tpl_messages.php:180 tpl_messages.php:193 tpl_messages.php:205
+#: tpl_messages.php:228 ../../../www/admin/addressbook/addr.php.in:283
#: ../../../www/admin/administrator/admin.php.in:313
#: ../../../www/admin/distributionlist/list.php.in:300
#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
@@ -64,19 +64,19 @@ msgstr "Modificar"
msgid "Delete"
msgstr "Borrar"
-#: tpl_messages.php:11 tpl_messages.php:216 tpl_messages.php:229
+#: tpl_messages.php:11 tpl_messages.php:217 tpl_messages.php:230
msgid "[ ALL ]"
msgstr "[ TODOS ]"
-#: tpl_messages.php:12 tpl_messages.php:217 tpl_messages.php:230
+#: tpl_messages.php:12 tpl_messages.php:218 tpl_messages.php:231
msgid "[ OTHER ]"
msgstr "[ OTROS ]"
-#: tpl_messages.php:13 tpl_messages.php:218 tpl_messages.php:231
+#: tpl_messages.php:13 tpl_messages.php:219 tpl_messages.php:232
msgid "Filter:"
msgstr "Filtro:"
-#: tpl_messages.php:14 tpl_messages.php:219 tpl_messages.php:232
+#: tpl_messages.php:14 tpl_messages.php:220 tpl_messages.php:233
msgid "Filter"
msgstr "Filtro"
@@ -313,7 +313,7 @@ msgstr "Recibir correo regular a carpeta"
#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:157
#: tpl_messages.php:161 tpl_messages.php:164 tpl_messages.php:167
#: tpl_messages.php:170 tpl_messages.php:173 tpl_messages.php:176
-#: tpl_messages.php:188 tpl_messages.php:242
+#: tpl_messages.php:189 tpl_messages.php:243
msgid "Update"
msgstr "Actualizar"
@@ -897,7 +897,7 @@ msgstr "Dominios"
msgid "Domain"
msgstr "Dominio"
-#: tpl_messages.php:181 tpl_messages.php:193
+#: tpl_messages.php:181 tpl_messages.php:194
msgid "Add"
msgstr "Añadir"
@@ -920,6 +920,10 @@ msgstr ""
"remitente está presente."
#: tpl_messages.php:185
+msgid "Action to take for messages that fail the check:"
+msgstr ""
+
+#: tpl_messages.php:186
msgid ""
"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 "
@@ -930,11 +934,11 @@ msgstr ""
"reescribe la cabecera From de modo que el recipiente pueda ver la potencial "
"falsificación."
-#: tpl_messages.php:186
+#: tpl_messages.php:187
msgid "Always reject the message."
msgstr "Rechazar siempre el mensaje."
-#: tpl_messages.php:187
+#: tpl_messages.php:188
msgid ""
"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 "
@@ -945,47 +949,47 @@ msgstr ""
"una cuenta de este servidor. Es sabido que puede causar problemas con listas "
"de correo."
-#: tpl_messages.php:189
+#: tpl_messages.php:190
msgid "Kolab Hostnames (for Master and Slaves)"
msgstr "Nombres de host Kolab (para Maestro y Esclavos)"
-#: tpl_messages.php:190
+#: tpl_messages.php:191
msgid "Host"
msgstr ""
-#: tpl_messages.php:194
+#: tpl_messages.php:195
msgid "The shared folder with DN"
msgstr "La carpeta compartida con DN"
-#: tpl_messages.php:196
+#: tpl_messages.php:197
msgid "Back to list of shared folders"
msgstr "Volver a la lista de carpetas compartidas"
-#: tpl_messages.php:197
+#: tpl_messages.php:198
msgid "Shared folders"
msgstr "Carpetas compartidas"
-#: tpl_messages.php:199
+#: tpl_messages.php:200
msgid "Server"
msgstr "Servidor"
-#: tpl_messages.php:200 tpl_messages.php:220
+#: tpl_messages.php:201 tpl_messages.php:221
msgid "Type"
msgstr "Tipo"
-#: tpl_messages.php:202
+#: tpl_messages.php:203
msgid "Folder deleted, awaiting cleanup..."
msgstr "Carpeta borrada, esperando limpieza..."
-#: tpl_messages.php:205 tpl_messages.php:247
+#: tpl_messages.php:206 tpl_messages.php:248
msgid "Welcome to the Kolab administration interface"
msgstr "Bienvenida al interfaz de administración de Kolab"
-#: tpl_messages.php:206
+#: tpl_messages.php:207
msgid "NOTE:"
msgstr "NOTA:"
-#: tpl_messages.php:207
+#: tpl_messages.php:208
msgid ""
"No account is configured to receive mail for administrative addresses. If "
"you have not yet created an account for this, "
@@ -993,51 +997,51 @@ msgstr ""
"No hay un cuenta configurada para recibir mensajes de direcciones "
"administrativas. Si todavía no ha creado una cuenta para ello,"
-#: tpl_messages.php:208
+#: tpl_messages.php:209
msgid "please do so"
msgstr "por favor hacer así"
-#: tpl_messages.php:209
+#: tpl_messages.php:210
msgid "and then go"
msgstr "y entonces vamos"
-#: tpl_messages.php:210
+#: tpl_messages.php:211
msgid "here"
msgstr "aquí"
-#: tpl_messages.php:211
+#: tpl_messages.php:212
msgid "to set up forwarding of mail to administrative email addresses."
msgstr "para establecer el envío de correo a las direcciones administrativas."
-#: tpl_messages.php:212
+#: tpl_messages.php:213
msgid "The user with DN"
msgstr "El usuario con DN"
-#: tpl_messages.php:214
+#: tpl_messages.php:215
msgid "Back to list of users"
msgstr "Volver a la lista de usuarios"
-#: tpl_messages.php:215 tpl_messages.php:228
+#: tpl_messages.php:216 tpl_messages.php:229
msgid "Email Users"
msgstr "Usuario de correo electrónico"
-#: tpl_messages.php:222
+#: tpl_messages.php:223
msgid "E-mail"
msgstr "Correo electrónico"
-#: tpl_messages.php:223
+#: tpl_messages.php:224
msgid "uid"
msgstr ""
-#: tpl_messages.php:225
+#: tpl_messages.php:226
msgid "User Deleted, awaiting cleanup..."
msgstr "Usuario borrado, esperando limpieza..."
-#: tpl_messages.php:233
+#: tpl_messages.php:234
msgid "Vacation Notification"
msgstr "Notificación de vacaciones"
-#: tpl_messages.php:234
+#: tpl_messages.php:235
msgid ""
"Activate vacation notification (only one of vacation, forward and delivery "
"to folder can be active at any time)"
@@ -1045,47 +1049,47 @@ msgstr ""
"Activar la notificación de vacaciones (sólo una por periodo vacacional, "
"envío y recepción a carpeta pueden ser activados en cualquier momento)"
-#: tpl_messages.php:235
+#: tpl_messages.php:236
msgid "Resend notification only after"
msgstr "Reenviar notificación sólo después"
-#: tpl_messages.php:236
+#: tpl_messages.php:237
msgid "days"
msgstr "días"
-#: tpl_messages.php:237
+#: tpl_messages.php:238
msgid "Send responses for these addresses:"
msgstr "Enviar respuestas para estas direcciones:"
-#: tpl_messages.php:238
+#: tpl_messages.php:239
msgid "(one address per line)"
msgstr "(una dirección por línea)"
-#: tpl_messages.php:239
+#: tpl_messages.php:240
msgid "Do not send vacation replies to spam messages"
msgstr "No enviar respuestas de vacaciones a mensajes de correo basura"
-#: tpl_messages.php:240
+#: tpl_messages.php:241
msgid "Only react to mail coming from domain"
msgstr "Reaccionar sólo a los mensajes que vengan del dominio"
-#: tpl_messages.php:241
+#: tpl_messages.php:242
msgid "(leave empty for all domains)"
msgstr "(dejar vacío para todos los dominios)"
-#: tpl_messages.php:243
+#: tpl_messages.php:244
msgid "Kolab2 Groupware Server Version"
msgstr "Servidor Groupware Kolab2 Versión"
-#: tpl_messages.php:244
+#: tpl_messages.php:245
msgid "Kolab2 Groupware Server Component Versions"
msgstr "Componentes del Servidor groupware Kolab2 Versiones"
-#: tpl_messages.php:245
+#: tpl_messages.php:246
msgid "Kolab2 Patched OpenPKG Package Versions"
msgstr "Paquetes Kolab2 OpenPKG Parcheados Versiones"
-#: tpl_messages.php:246
+#: tpl_messages.php:247
msgid "OpenPKG Version"
msgstr "OpenPKG Versión"
diff --git a/php/admin/locale/fr/LC_MESSAGES/messages.po b/php/admin/locale/fr/LC_MESSAGES/messages.po
index 4a0446d..12d3471 100644
--- a/php/admin/locale/fr/LC_MESSAGES/messages.po
+++ b/php/admin/locale/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Kolab-Webadmin French\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-21 14:25+0100\n"
+"POT-Creation-Date: 2007-11-21 15:22+0100\n"
"PO-Revision-Date: 2007-11-21 14:56+0100\n"
"Last-Translator: Jean-Michel LACROIX <jm-lacroix@savigny.org>\n"
"Language-Team: Kolab development coordination <kolab-devel@kolab.org>\n"
@@ -20,7 +20,7 @@ msgid "The address with DN"
msgstr "L'adresse de messagerie avec le DN"
#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:130 tpl_messages.php:196 tpl_messages.php:214
msgid "has been deleted"
msgstr "à été effacé"
@@ -33,29 +33,29 @@ msgid "(only external addresses without a kolab user account)"
msgstr "(seulement les adresses externes sans un compte de messagerie Kolab)"
#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:198
-#: tpl_messages.php:221 ../../../www/admin/addressbook/index.php.in:123
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:199
+#: tpl_messages.php:222 ../../../www/admin/addressbook/index.php.in:123
#: ../../../www/admin/user/index.php.in:185
msgid "Name"
msgstr "Nom"
#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:179 tpl_messages.php:191 tpl_messages.php:201
-#: tpl_messages.php:224
+#: tpl_messages.php:179 tpl_messages.php:192 tpl_messages.php:202
+#: tpl_messages.php:225
msgid "Action"
msgstr "Action"
#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:203 tpl_messages.php:226
+#: tpl_messages.php:204 tpl_messages.php:227
msgid "Modify"
msgstr "Modifier"
#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:180 tpl_messages.php:192 tpl_messages.php:204
-#: tpl_messages.php:227 ../../../www/admin/addressbook/addr.php.in:283
+#: tpl_messages.php:180 tpl_messages.php:193 tpl_messages.php:205
+#: tpl_messages.php:228 ../../../www/admin/addressbook/addr.php.in:283
#: ../../../www/admin/administrator/admin.php.in:313
#: ../../../www/admin/distributionlist/list.php.in:300
#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
@@ -65,19 +65,19 @@ msgstr "Modifier"
msgid "Delete"
msgstr "Effacer"
-#: tpl_messages.php:11 tpl_messages.php:216 tpl_messages.php:229
+#: tpl_messages.php:11 tpl_messages.php:217 tpl_messages.php:230
msgid "[ ALL ]"
msgstr "[ Tous ]"
-#: tpl_messages.php:12 tpl_messages.php:217 tpl_messages.php:230
+#: tpl_messages.php:12 tpl_messages.php:218 tpl_messages.php:231
msgid "[ OTHER ]"
msgstr "[ Autres ]"
-#: tpl_messages.php:13 tpl_messages.php:218 tpl_messages.php:231
+#: tpl_messages.php:13 tpl_messages.php:219 tpl_messages.php:232
msgid "Filter:"
msgstr "Filtre:"
-#: tpl_messages.php:14 tpl_messages.php:219 tpl_messages.php:232
+#: tpl_messages.php:14 tpl_messages.php:220 tpl_messages.php:233
msgid "Filter"
msgstr "Filtre"
@@ -314,7 +314,7 @@ msgstr "Délivrer les mail normaux vers un dossier"
#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:157
#: tpl_messages.php:161 tpl_messages.php:164 tpl_messages.php:167
#: tpl_messages.php:170 tpl_messages.php:173 tpl_messages.php:176
-#: tpl_messages.php:188 tpl_messages.php:242
+#: tpl_messages.php:189 tpl_messages.php:243
msgid "Update"
msgstr "Mise a jour"
@@ -894,7 +894,7 @@ msgstr "contient"
msgid "Domain"
msgstr "Domaine"
-#: tpl_messages.php:181 tpl_messages.php:193
+#: tpl_messages.php:181 tpl_messages.php:194
msgid "Add"
msgstr "Ajouter"
@@ -917,6 +917,10 @@ msgstr ""
"vérification ci dessus sont activées."
#: tpl_messages.php:185
+msgid "Action to take for messages that fail the check:"
+msgstr ""
+
+#: tpl_messages.php:186
msgid ""
"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 "
@@ -926,11 +930,11 @@ msgstr ""
"d'expéditeur qui correspond au domaine de Kolab. Si c'est le cas, l'en-tête "
"est réécrite pour en informer le destinataire."
-#: tpl_messages.php:186
+#: tpl_messages.php:187
msgid "Always reject the message."
msgstr "Toujours rejeter"
-#: tpl_messages.php:187
+#: tpl_messages.php:188
msgid ""
"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 "
@@ -943,47 +947,47 @@ msgstr ""
"messagerie sur ce serveur. Ceci arrive par exemple avec les listes de "
"discutions."
-#: tpl_messages.php:189
+#: tpl_messages.php:190
msgid "Kolab Hostnames (for Master and Slaves)"
msgstr "Nom d'hôtes Kolab (pour serveur maître et esclaves)"
-#: tpl_messages.php:190
+#: tpl_messages.php:191
msgid "Host"
msgstr "Serveur"
-#: tpl_messages.php:194
+#: tpl_messages.php:195
msgid "The shared folder with DN"
msgstr "L'utilisateur avec le DN"
-#: tpl_messages.php:196
+#: tpl_messages.php:197
msgid "Back to list of shared folders"
msgstr "Retour à la liste des utilisateurs"
-#: tpl_messages.php:197
+#: tpl_messages.php:198
msgid "Shared folders"
msgstr "Dossier Partagés"
-#: tpl_messages.php:199
+#: tpl_messages.php:200
msgid "Server"
msgstr "Serveur"
-#: tpl_messages.php:200 tpl_messages.php:220
+#: tpl_messages.php:201 tpl_messages.php:221
msgid "Type"
msgstr "Type"
-#: tpl_messages.php:202
+#: tpl_messages.php:203
msgid "Folder deleted, awaiting cleanup..."
msgstr "Répertoire effacé, en attente de nettoyage..."
-#: tpl_messages.php:205 tpl_messages.php:247
+#: tpl_messages.php:206 tpl_messages.php:248
msgid "Welcome to the Kolab administration interface"
msgstr "Bienvenue dans l'interface d'administration de Kolab"
-#: tpl_messages.php:206
+#: tpl_messages.php:207
msgid "NOTE:"
msgstr "Note:"
-#: tpl_messages.php:207
+#: tpl_messages.php:208
msgid ""
"No account is configured to receive mail for administrative addresses. If "
"you have not yet created an account for this, "
@@ -992,51 +996,51 @@ msgstr ""
"adresses administratives. Si vous n'avez pas encore crée un compte pour "
"cela, veuillez le faire dès maintenant"
-#: tpl_messages.php:208
+#: tpl_messages.php:209
msgid "please do so"
msgstr "veuillez le faire"
-#: tpl_messages.php:209
+#: tpl_messages.php:210
msgid "and then go"
msgstr "et ensuite aller"
-#: tpl_messages.php:210
+#: tpl_messages.php:211
msgid "here"
msgstr "ici"
-#: tpl_messages.php:211
+#: tpl_messages.php:212
msgid "to set up forwarding of mail to administrative email addresses."
msgstr "pour configurer le renvoi des mail à une adresse administrative. "
-#: tpl_messages.php:212
+#: tpl_messages.php:213
msgid "The user with DN"
msgstr "L'utilisateur avec le DN"
-#: tpl_messages.php:214
+#: tpl_messages.php:215
msgid "Back to list of users"
msgstr "Retour à la liste des utilisateurs"
-#: tpl_messages.php:215 tpl_messages.php:228
+#: tpl_messages.php:216 tpl_messages.php:229
msgid "Email Users"
msgstr "addresse de messagerie des utilisateurs"
-#: tpl_messages.php:222
+#: tpl_messages.php:223
msgid "E-mail"
msgstr "Adresse de messagerie"
-#: tpl_messages.php:223
+#: tpl_messages.php:224
msgid "uid"
msgstr "uid"
-#: tpl_messages.php:225
+#: tpl_messages.php:226
msgid "User Deleted, awaiting cleanup..."
msgstr "Utilisateur effacé, en attente du nettoyage..."
-#: tpl_messages.php:233
+#: tpl_messages.php:234
msgid "Vacation Notification"
msgstr "Message d'absence"
-#: tpl_messages.php:234
+#: tpl_messages.php:235
msgid ""
"Activate vacation notification (only one of vacation, forward and delivery "
"to folder can be active at any time)"
@@ -1045,47 +1049,47 @@ msgstr ""
"notification d'absence à la fois pour la réception ou la transmission dans "
"un dossier.)"
-#: tpl_messages.php:235
+#: tpl_messages.php:236
msgid "Resend notification only after"
msgstr "Seulement renvoyer les notifications après"
-#: tpl_messages.php:236
+#: tpl_messages.php:237
msgid "days"
msgstr "jours"
-#: tpl_messages.php:237
+#: tpl_messages.php:238
msgid "Send responses for these addresses:"
msgstr "Envoyer des réponses pour ces adresses:"
-#: tpl_messages.php:238
+#: tpl_messages.php:239
msgid "(one address per line)"
msgstr "(une adresse par ligne)"
-#: tpl_messages.php:239
+#: tpl_messages.php:240
msgid "Do not send vacation replies to spam messages"
msgstr "Ne pas envoyer de messages d'absence au spam"
-#: tpl_messages.php:240
+#: tpl_messages.php:241
msgid "Only react to mail coming from domain"
msgstr "Réagir seulement au messages venant du domaine"
-#: tpl_messages.php:241
+#: tpl_messages.php:242
msgid "(leave empty for all domains)"
msgstr "(laisser vide pour tout les domaines)"
-#: tpl_messages.php:243
+#: tpl_messages.php:244
msgid "Kolab2 Groupware Server Version"
msgstr "Version du serveur de collaboration Kolab2"
-#: tpl_messages.php:244
+#: tpl_messages.php:245
msgid "Kolab2 Groupware Server Component Versions"
msgstr "Version des composants du serveur de collaboration Kolab2"
-#: tpl_messages.php:245
+#: tpl_messages.php:246
msgid "Kolab2 Patched OpenPKG Package Versions"
msgstr "Version modifiée des paquets OpenPKG"
-#: tpl_messages.php:246
+#: tpl_messages.php:247
msgid "OpenPKG Version"
msgstr "Version de OpenPKG"
diff --git a/php/admin/locale/it/LC_MESSAGES/messages.po b/php/admin/locale/it/LC_MESSAGES/messages.po
index 68c9222..9e14335 100644
--- a/php/admin/locale/it/LC_MESSAGES/messages.po
+++ b/php/admin/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Kolab-Webadmin Italian\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-21 14:25+0100\n"
+"POT-Creation-Date: 2007-11-21 15:22+0100\n"
"PO-Revision-Date: 2007-11-21 14:56+0100\n"
"Last-Translator: Yvette Agostini <yvette@yvetteagostini.it>\n"
"Language-Team: Kolab development coordination <kolab-devel@kolab.org>\n"
@@ -19,7 +19,7 @@ msgid "The address with DN"
msgstr "L'indirizzo con il DN"
#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:130 tpl_messages.php:196 tpl_messages.php:214
msgid "has been deleted"
msgstr "è stato cancellato"
@@ -32,29 +32,29 @@ msgid "(only external addresses without a kolab user account)"
msgstr "(solo indirizzi esterni senza account utente Kolab)"
#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:198
-#: tpl_messages.php:221 ../../../www/admin/addressbook/index.php.in:123
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:199
+#: tpl_messages.php:222 ../../../www/admin/addressbook/index.php.in:123
#: ../../../www/admin/user/index.php.in:185
msgid "Name"
msgstr "Nome"
#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:179 tpl_messages.php:191 tpl_messages.php:201
-#: tpl_messages.php:224
+#: tpl_messages.php:179 tpl_messages.php:192 tpl_messages.php:202
+#: tpl_messages.php:225
msgid "Action"
msgstr "Azione"
#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:203 tpl_messages.php:226
+#: tpl_messages.php:204 tpl_messages.php:227
msgid "Modify"
msgstr "Modifica"
#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:180 tpl_messages.php:192 tpl_messages.php:204
-#: tpl_messages.php:227 ../../../www/admin/addressbook/addr.php.in:283
+#: tpl_messages.php:180 tpl_messages.php:193 tpl_messages.php:205
+#: tpl_messages.php:228 ../../../www/admin/addressbook/addr.php.in:283
#: ../../../www/admin/administrator/admin.php.in:313
#: ../../../www/admin/distributionlist/list.php.in:300
#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
@@ -64,19 +64,19 @@ msgstr "Modifica"
msgid "Delete"
msgstr "Cancella"
-#: tpl_messages.php:11 tpl_messages.php:216 tpl_messages.php:229
+#: tpl_messages.php:11 tpl_messages.php:217 tpl_messages.php:230
msgid "[ ALL ]"
msgstr "[ TUTTI ]"
-#: tpl_messages.php:12 tpl_messages.php:217 tpl_messages.php:230
+#: tpl_messages.php:12 tpl_messages.php:218 tpl_messages.php:231
msgid "[ OTHER ]"
msgstr "[ ALTRI ]"
-#: tpl_messages.php:13 tpl_messages.php:218 tpl_messages.php:231
+#: tpl_messages.php:13 tpl_messages.php:219 tpl_messages.php:232
msgid "Filter:"
msgstr "Filtro:"
-#: tpl_messages.php:14 tpl_messages.php:219 tpl_messages.php:232
+#: tpl_messages.php:14 tpl_messages.php:220 tpl_messages.php:233
msgid "Filter"
msgstr "Filtro"
@@ -313,7 +313,7 @@ msgstr "Consegna la mail normale nella cartella"
#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:157
#: tpl_messages.php:161 tpl_messages.php:164 tpl_messages.php:167
#: tpl_messages.php:170 tpl_messages.php:173 tpl_messages.php:176
-#: tpl_messages.php:188 tpl_messages.php:242
+#: tpl_messages.php:189 tpl_messages.php:243
msgid "Update"
msgstr "Aggiorna"
@@ -897,7 +897,7 @@ msgstr "Domini"
msgid "Domain"
msgstr "Dominio"
-#: tpl_messages.php:181 tpl_messages.php:193
+#: tpl_messages.php:181 tpl_messages.php:194
msgid "Add"
msgstr "Aggiungi"
@@ -920,6 +920,10 @@ msgstr ""
"Sender è presente."
#: tpl_messages.php:185
+msgid "Action to take for messages that fail the check:"
+msgstr ""
+
+#: tpl_messages.php:186
msgid ""
"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 "
@@ -930,11 +934,11 @@ msgstr ""
"riscrivi l'intestazione From in maniera tale che il destinatario possa "
"constatare la possibile falsificazione."
-#: tpl_messages.php:186
+#: tpl_messages.php:187
msgid "Always reject the message."
msgstr "Rifiuta sempre il messaggio"
-#: tpl_messages.php:187
+#: tpl_messages.php:188
msgid ""
"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 "
@@ -945,49 +949,49 @@ msgstr ""
"il mittente è un account sul server. Questo è una riconosciuta fonte di "
"problemi come ad esempio le mailinglist."
-#: tpl_messages.php:189
+#: tpl_messages.php:190
msgid "Kolab Hostnames (for Master and Slaves)"
msgstr ""
-#: tpl_messages.php:190
+#: tpl_messages.php:191
msgid "Host"
msgstr "Server"
-#: tpl_messages.php:194
+#: tpl_messages.php:195
#, fuzzy
msgid "The shared folder with DN"
msgstr "L'utente con DN"
-#: tpl_messages.php:196
+#: tpl_messages.php:197
#, fuzzy
msgid "Back to list of shared folders"
msgstr "Ritorna alla lista degli utenti"
-#: tpl_messages.php:197
+#: tpl_messages.php:198
msgid "Shared folders"
msgstr "Cartelle condivise"
-#: tpl_messages.php:199
+#: tpl_messages.php:200
msgid "Server"
msgstr "Server"
-#: tpl_messages.php:200 tpl_messages.php:220
+#: tpl_messages.php:201 tpl_messages.php:221
msgid "Type"
msgstr "Tipo"
-#: tpl_messages.php:202
+#: tpl_messages.php:203
msgid "Folder deleted, awaiting cleanup..."
msgstr "Cartella cancellata, in attesa della pulizia..."
-#: tpl_messages.php:205 tpl_messages.php:247
+#: tpl_messages.php:206 tpl_messages.php:248
msgid "Welcome to the Kolab administration interface"
msgstr "Benvenuto all'interfaccia di amministrazione di Kolab"
-#: tpl_messages.php:206
+#: tpl_messages.php:207
msgid "NOTE:"
msgstr "NOTA:"
-#: tpl_messages.php:207
+#: tpl_messages.php:208
#, fuzzy
msgid ""
"No account is configured to receive mail for administrative addresses. If "
@@ -997,51 +1001,51 @@ msgstr ""
"amministrativi. Se non è stato ancora creato un account per questo, fatelo "
"prima di proseguire"
-#: tpl_messages.php:208
+#: tpl_messages.php:209
msgid "please do so"
msgstr ""
-#: tpl_messages.php:209
+#: tpl_messages.php:210
msgid "and then go"
msgstr ""
-#: tpl_messages.php:210
+#: tpl_messages.php:211
msgid "here"
msgstr "qui"
-#: tpl_messages.php:211
+#: tpl_messages.php:212
msgid "to set up forwarding of mail to administrative email addresses."
msgstr "per impostare l'inoltro delle email a degli indirizzi amministrativi."
-#: tpl_messages.php:212
+#: tpl_messages.php:213
msgid "The user with DN"
msgstr "L'utente con DN"
-#: tpl_messages.php:214
+#: tpl_messages.php:215
msgid "Back to list of users"
msgstr "Ritorna alla lista degli utenti"
-#: tpl_messages.php:215 tpl_messages.php:228
+#: tpl_messages.php:216 tpl_messages.php:229
msgid "Email Users"
msgstr "Utenti Email"
-#: tpl_messages.php:222
+#: tpl_messages.php:223
msgid "E-mail"
msgstr "E-mail"
-#: tpl_messages.php:223
+#: tpl_messages.php:224
msgid "uid"
msgstr "uid"
-#: tpl_messages.php:225
+#: tpl_messages.php:226
msgid "User Deleted, awaiting cleanup..."
msgstr "Utente cancellato, in attesa di pulizia..."
-#: tpl_messages.php:233
+#: tpl_messages.php:234
msgid "Vacation Notification"
msgstr "Notifica di assenza"
-#: tpl_messages.php:234
+#: tpl_messages.php:235
msgid ""
"Activate vacation notification (only one of vacation, forward and delivery "
"to folder can be active at any time)"
@@ -1049,47 +1053,47 @@ msgstr ""
"Attiva notifica d'assenza (solo uno tra assenza, inoltro e invio in "
"cartella può essere attivo allo stesso tempo)"
-#: tpl_messages.php:235
+#: tpl_messages.php:236
msgid "Resend notification only after"
msgstr "Rispedisci la notifica solo dopo"
-#: tpl_messages.php:236
+#: tpl_messages.php:237
msgid "days"
msgstr "giorni"
-#: tpl_messages.php:237
+#: tpl_messages.php:238
msgid "Send responses for these addresses:"
msgstr "Invia risposte per questi indirizzi:"
-#: tpl_messages.php:238
+#: tpl_messages.php:239
msgid "(one address per line)"
msgstr "(un indirizzo per linea)"
-#: tpl_messages.php:239
+#: tpl_messages.php:240
msgid "Do not send vacation replies to spam messages"
msgstr "Non inviare le risposte automatiche di assenza ai messaggi di spam"
-#: tpl_messages.php:240
+#: tpl_messages.php:241
msgid "Only react to mail coming from domain"
msgstr "Reagisci solo alle mail in arrivo dal dominio"
-#: tpl_messages.php:241
+#: tpl_messages.php:242
msgid "(leave empty for all domains)"
msgstr "(lasciare vuoto per tutti i domini)"
-#: tpl_messages.php:243
+#: tpl_messages.php:244
msgid "Kolab2 Groupware Server Version"
msgstr "Versione Server Groupware Kolab2 "
-#: tpl_messages.php:244
+#: tpl_messages.php:245
msgid "Kolab2 Groupware Server Component Versions"
msgstr "Versione Componenti Server Groupware Kolab2"
-#: tpl_messages.php:245
+#: tpl_messages.php:246
msgid "Kolab2 Patched OpenPKG Package Versions"
msgstr "Versioni Modificate dei Pacchetti OpenPKG"
-#: tpl_messages.php:246
+#: tpl_messages.php:247
msgid "OpenPKG Version"
msgstr "Versione OpenPKG"
diff --git a/php/admin/locale/nl/LC_MESSAGES/messages.po b/php/admin/locale/nl/LC_MESSAGES/messages.po
index 1ee5949..2f7c85f 100644
--- a/php/admin/locale/nl/LC_MESSAGES/messages.po
+++ b/php/admin/locale/nl/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Kolab-Webadmin Dutch\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-21 14:25+0100\n"
+"POT-Creation-Date: 2007-11-21 15:22+0100\n"
"PO-Revision-Date: 2007-11-21 14:56+0100\n"
"Last-Translator: Richard Bos <richard@radoeka.nl>\n"
"Language-Team: Kolab development coordination <kolab-devel@kolab.org>\n"
@@ -20,7 +20,7 @@ msgid "The address with DN"
msgstr "Het adres met DN"
#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:130 tpl_messages.php:196 tpl_messages.php:214
msgid "has been deleted"
msgstr "Is verwijderd"
@@ -33,29 +33,29 @@ msgid "(only external addresses without a kolab user account)"
msgstr " (alleen externe adressen zonder Kolab gebruikersaccount) "
#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:198
-#: tpl_messages.php:221 ../../../www/admin/addressbook/index.php.in:123
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:199
+#: tpl_messages.php:222 ../../../www/admin/addressbook/index.php.in:123
#: ../../../www/admin/user/index.php.in:185
msgid "Name"
msgstr "Naam"
#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:179 tpl_messages.php:191 tpl_messages.php:201
-#: tpl_messages.php:224
+#: tpl_messages.php:179 tpl_messages.php:192 tpl_messages.php:202
+#: tpl_messages.php:225
msgid "Action"
msgstr "Actie"
#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:203 tpl_messages.php:226
+#: tpl_messages.php:204 tpl_messages.php:227
msgid "Modify"
msgstr "Wijzigen"
#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:180 tpl_messages.php:192 tpl_messages.php:204
-#: tpl_messages.php:227 ../../../www/admin/addressbook/addr.php.in:283
+#: tpl_messages.php:180 tpl_messages.php:193 tpl_messages.php:205
+#: tpl_messages.php:228 ../../../www/admin/addressbook/addr.php.in:283
#: ../../../www/admin/administrator/admin.php.in:313
#: ../../../www/admin/distributionlist/list.php.in:300
#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
@@ -65,19 +65,19 @@ msgstr "Wijzigen"
msgid "Delete"
msgstr "Verwijderen"
-#: tpl_messages.php:11 tpl_messages.php:216 tpl_messages.php:229
+#: tpl_messages.php:11 tpl_messages.php:217 tpl_messages.php:230
msgid "[ ALL ]"
msgstr "[ ALLE ]"
-#: tpl_messages.php:12 tpl_messages.php:217 tpl_messages.php:230
+#: tpl_messages.php:12 tpl_messages.php:218 tpl_messages.php:231
msgid "[ OTHER ]"
msgstr "[ Andere ]"
-#: tpl_messages.php:13 tpl_messages.php:218 tpl_messages.php:231
+#: tpl_messages.php:13 tpl_messages.php:219 tpl_messages.php:232
msgid "Filter:"
msgstr "Filter"
-#: tpl_messages.php:14 tpl_messages.php:219 tpl_messages.php:232
+#: tpl_messages.php:14 tpl_messages.php:220 tpl_messages.php:233
msgid "Filter"
msgstr "Filter"
@@ -313,7 +313,7 @@ msgstr "Plaats de reguliere mail in map"
#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:157
#: tpl_messages.php:161 tpl_messages.php:164 tpl_messages.php:167
#: tpl_messages.php:170 tpl_messages.php:173 tpl_messages.php:176
-#: tpl_messages.php:188 tpl_messages.php:242
+#: tpl_messages.php:189 tpl_messages.php:243
msgid "Update"
msgstr "Bijwerken"
@@ -887,7 +887,7 @@ msgstr "Domeinen"
msgid "Domain"
msgstr "Domein"
-#: tpl_messages.php:181 tpl_messages.php:193
+#: tpl_messages.php:181 tpl_messages.php:194
msgid "Add"
msgstr "Toevoegen"
@@ -909,17 +909,21 @@ msgstr ""
"indien aanwezig."
#: tpl_messages.php:185
+msgid "Action to take for messages that fail the check:"
+msgstr ""
+
+#: tpl_messages.php:186
msgid ""
"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."
msgstr ""
-#: tpl_messages.php:186
+#: tpl_messages.php:187
msgid "Always reject the message."
msgstr "Het bericht altijd afwijzen. "
-#: tpl_messages.php:187
+#: tpl_messages.php:188
msgid ""
"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 "
@@ -931,47 +935,47 @@ msgstr ""
"afzender een account heeft op deze server. Dit gebeurt soms met "
"mailinglijsten."
-#: tpl_messages.php:189
+#: tpl_messages.php:190
msgid "Kolab Hostnames (for Master and Slaves)"
msgstr "Kolab hostnamen (voor Master en Slaves)"
-#: tpl_messages.php:190
+#: tpl_messages.php:191
msgid "Host"
msgstr "Host"
-#: tpl_messages.php:194
+#: tpl_messages.php:195
msgid "The shared folder with DN"
msgstr "De gedeelde folder met DN"
-#: tpl_messages.php:196
+#: tpl_messages.php:197
msgid "Back to list of shared folders"
msgstr "Terug naar de lijst van de gebruikers"
-#: tpl_messages.php:197
+#: tpl_messages.php:198
msgid "Shared folders"
msgstr "Gedeelde mappen"
-#: tpl_messages.php:199
+#: tpl_messages.php:200
msgid "Server"
msgstr "Server"
-#: tpl_messages.php:200 tpl_messages.php:220
+#: tpl_messages.php:201 tpl_messages.php:221
msgid "Type"
msgstr "Soort"
-#: tpl_messages.php:202
+#: tpl_messages.php:203
msgid "Folder deleted, awaiting cleanup..."
msgstr "Map verwijderd, wacht op opruiming... "
-#: tpl_messages.php:205 tpl_messages.php:247
+#: tpl_messages.php:206 tpl_messages.php:248
msgid "Welcome to the Kolab administration interface"
msgstr "Welkom op Kolab beheersinterface"
-#: tpl_messages.php:206
+#: tpl_messages.php:207
msgid "NOTE:"
msgstr "OPMERKING:"
-#: tpl_messages.php:207
+#: tpl_messages.php:208
msgid ""
"No account is configured to receive mail for administrative addresses. If "
"you have not yet created an account for this, "
@@ -980,52 +984,52 @@ msgstr ""
"adressen. Als je daarvoor nog geen account aangemaakt hebt, gelieve er één "
"aan te maken en ga dan verder "
-#: tpl_messages.php:208
+#: tpl_messages.php:209
msgid "please do so"
msgstr "doe dat"
-#: tpl_messages.php:209
+#: tpl_messages.php:210
msgid "and then go"
msgstr "en ga dan naar"
-#: tpl_messages.php:210
+#: tpl_messages.php:211
msgid "here"
msgstr "hier"
-#: tpl_messages.php:211
+#: tpl_messages.php:212
msgid "to set up forwarding of mail to administrative email addresses."
msgstr ""
"Om het doorsturen van mail naar administratieve E-mailadressen in te stellen."
-#: tpl_messages.php:212
+#: tpl_messages.php:213
msgid "The user with DN"
msgstr "De gebruiker met DN"
-#: tpl_messages.php:214
+#: tpl_messages.php:215
msgid "Back to list of users"
msgstr "Terug naar de lijst van de gebruikers"
-#: tpl_messages.php:215 tpl_messages.php:228
+#: tpl_messages.php:216 tpl_messages.php:229
msgid "Email Users"
msgstr "Gebruikers E-mail"
-#: tpl_messages.php:222
+#: tpl_messages.php:223
msgid "E-mail"
msgstr "E-mail"
-#: tpl_messages.php:223
+#: tpl_messages.php:224
msgid "uid"
msgstr "uid"
-#: tpl_messages.php:225
+#: tpl_messages.php:226
msgid "User Deleted, awaiting cleanup..."
msgstr "Gebruiker verwijderd, wacht op opruiming..."
-#: tpl_messages.php:233
+#: tpl_messages.php:234
msgid "Vacation Notification"
msgstr "Afwezigheidsbericht"
-#: tpl_messages.php:234
+#: tpl_messages.php:235
msgid ""
"Activate vacation notification (only one of vacation, forward and delivery "
"to folder can be active at any time)"
@@ -1033,47 +1037,47 @@ msgstr ""
"Activeer afwezigheidsbericht (enkel één vakantie, forward en aflevering 's "
"folder kan tegelijkertijd geactieveerd zijn)"
-#: tpl_messages.php:235
+#: tpl_messages.php:236
msgid "Resend notification only after"
msgstr "Stuur mededeling enkel na "
-#: tpl_messages.php:236
+#: tpl_messages.php:237
msgid "days"
msgstr "dagen"
-#: tpl_messages.php:237
+#: tpl_messages.php:238
msgid "Send responses for these addresses:"
msgstr "Stuur antwoorden voor deze adressen:"
-#: tpl_messages.php:238
+#: tpl_messages.php:239
msgid "(one address per line)"
msgstr "(een adres per lijn)"
-#: tpl_messages.php:239
+#: tpl_messages.php:240
msgid "Do not send vacation replies to spam messages"
msgstr "Geen afwezigheidsberichten sturen naar spam"
-#: tpl_messages.php:240
+#: tpl_messages.php:241
msgid "Only react to mail coming from domain"
msgstr "Reageer alleen op mail afkomstig van het domein"
-#: tpl_messages.php:241
+#: tpl_messages.php:242
msgid "(leave empty for all domains)"
msgstr "(leeg laten voor alle domeinen)"
-#: tpl_messages.php:243
+#: tpl_messages.php:244
msgid "Kolab2 Groupware Server Version"
msgstr "Kolab2 Groupware Server Versie"
-#: tpl_messages.php:244
+#: tpl_messages.php:245
msgid "Kolab2 Groupware Server Component Versions"
msgstr "Kolab2 Groupware Server Component Versies"
-#: tpl_messages.php:245
+#: tpl_messages.php:246
msgid "Kolab2 Patched OpenPKG Package Versions"
msgstr "Kolab2 Patched OpenPKG Package Versies"
-#: tpl_messages.php:246
+#: tpl_messages.php:247
msgid "OpenPKG Version"
msgstr "OpenPKG Versie"
diff --git a/php/admin/templates/service.tpl b/php/admin/templates/service.tpl
index 0a0c085..000004f 100755
--- a/php/admin/templates/service.tpl
+++ b/php/admin/templates/service.tpl
@@ -138,7 +138,7 @@
<input type="checkbox" name="kolabfilterallowsender" {if $kolabfilterallowsender == 'true' }checked{/if} />
{tr msg="Use the Sender header instead of From for the above checks if Sender is present."}
<br />
-<h4>Action to take for messages that fail the check:</h4>
+<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/>
<input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked{/if} />