[debian-edu-commits] debian-edu/upstream/ 02/02: .tpl files: Replace smarty tags {ldelim} and {rdelim} by the corresponding html entities to fix gettext translations.

Mike Gabriel sunweaver at debian.org
Wed Aug 26 22:03:36 UTC 2015 

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa-plugin-mailaddress.

commit 9c30df823979783590aca6812328ebcf666430db
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Aug 27 00:03:24 2015 +0200

    .tpl files: Replace smarty tags {ldelim} and {rdelim} by the corresponding html entities to fix gettext translations.
---
 admin/groups/mailaddress/mailaddress.tpl |  2 +-
 locale/de/LC_MESSAGES/messages.po        | 86 ++++++++++++++++----------------
 locale/en/LC_MESSAGES/messages.po        | 82 +++++++++++++++---------------
 locale/messages.po                       | 72 +++++++++++++-------------
 personal/mailaddress/generic.tpl         |  2 +-
 5 files changed, 120 insertions(+), 124 deletions(-)

diff --git a/admin/groups/mailaddress/mailaddress.tpl b/admin/groups/mailaddress/mailaddress.tpl
index 6bf573c..2561f65 100644
--- a/admin/groups/mailaddress/mailaddress.tpl
+++ b/admin/groups/mailaddress/mailaddress.tpl
@@ -19,7 +19,7 @@
    <h3>{t}Generic{/t}</h3>
    <table summary="{t}Mail address settings{/t}">
     <tr>
-    <td colspan="2"><i>{t}Please specify a mail address pattern (e.g., {ldelim}%cn{rdelim}@your-domain.com) or leave empty.{/t}</i>
+    <td colspan="2"><i>{t}Please specify a mail address pattern (e.g., {%cn|@your-domain.com) or leave empty.{/t}</i>
     </td>
     </tr>
     <tr><td> </td></tr>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index a404194..f7407d8 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-26 21:28+0200\n"
+"POT-Creation-Date: 2015-08-27 00:01+0200\n"
 "PO-Revision-Date: 2015-08-26 21:59+0100\n"
 "Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: deutsch <de at li.org>\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: admin/groups/mailaddress/class_groupMail.inc:94
-#: admin/groups/mailaddress/class_groupMail.inc:96
-#: admin/groups/mailaddress/class_groupMail.inc:479
+#: admin/groups/mailaddress/class_groupMail.inc:91
+#: admin/groups/mailaddress/class_groupMail.inc:93
+#: admin/groups/mailaddress/class_groupMail.inc:474
 #: personal/mailaddress/class_mailAccount.inc:120
 #: personal/mailaddress/class_mailAccount.inc:122
 #: personal/mailaddress/class_mailAccount.inc:375
@@ -29,28 +29,28 @@ msgstr ""
 msgid "Mail"
 msgstr "Mail"
 
-#: admin/groups/mailaddress/class_groupMail.inc:123
-#: admin/groups/mailaddress/class_groupMail.inc:147
-#: admin/groups/mailaddress/class_groupMail.inc:153
-#: admin/groups/mailaddress/class_groupMail.inc:179
-#: admin/groups/mailaddress/class_groupMail.inc:185
-#: admin/groups/mailaddress/class_groupMail.inc:199
+#: admin/groups/mailaddress/class_groupMail.inc:120
+#: admin/groups/mailaddress/class_groupMail.inc:144
+#: admin/groups/mailaddress/class_groupMail.inc:150
+#: admin/groups/mailaddress/class_groupMail.inc:176
+#: admin/groups/mailaddress/class_groupMail.inc:182
+#: admin/groups/mailaddress/class_groupMail.inc:196
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/groups/mailaddress/class_groupMail.inc:123
+#: admin/groups/mailaddress/class_groupMail.inc:120
 msgid "Please select an entry!"
 msgstr "Bitte einen Eintrag auswählen"
 
-#: admin/groups/mailaddress/class_groupMail.inc:147
-#: admin/groups/mailaddress/class_groupMail.inc:179
-#: admin/groups/mailaddress/class_groupMail.inc:185
-#: admin/groups/mailaddress/class_groupMail.inc:199
-#: admin/groups/mailaddress/class_groupMail.inc:356
-#: admin/groups/mailaddress/class_groupMail.inc:359
-#: admin/groups/mailaddress/class_groupMail.inc:361
-#: admin/groups/mailaddress/class_groupMail.inc:373
-#: admin/groups/mailaddress/class_groupMail.inc:487
+#: admin/groups/mailaddress/class_groupMail.inc:144
+#: admin/groups/mailaddress/class_groupMail.inc:176
+#: admin/groups/mailaddress/class_groupMail.inc:182
+#: admin/groups/mailaddress/class_groupMail.inc:196
+#: admin/groups/mailaddress/class_groupMail.inc:352
+#: admin/groups/mailaddress/class_groupMail.inc:355
+#: admin/groups/mailaddress/class_groupMail.inc:357
+#: admin/groups/mailaddress/class_groupMail.inc:368
+#: admin/groups/mailaddress/class_groupMail.inc:482
 #: admin/groups/mailaddress/mailaddress.tpl:10
 #: admin/groups/mailaddress/paste_mailaddress.tpl:9
 #: personal/mailaddress/class_mailAccount.inc:283
@@ -63,48 +63,44 @@ msgstr "Bitte einen Eintrag auswählen"
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: admin/groups/mailaddress/class_groupMail.inc:153
+#: admin/groups/mailaddress/class_groupMail.inc:150
 msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
 "Die Primäre Mail-Addresse kann nicht zur Liste der Weiterleitungen "
 "hinzugefügt werden!"
 
-#: admin/groups/mailaddress/class_groupMail.inc:195
+#: admin/groups/mailaddress/class_groupMail.inc:192
 #: personal/mailaddress/class_mailAccount.inc:309
 #, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "Die Adresse wird bereits von der Gruppe '%s' verwendet."
 
-#: admin/groups/mailaddress/class_groupMail.inc:197
+#: admin/groups/mailaddress/class_groupMail.inc:194
 #: personal/mailaddress/class_mailAccount.inc:311
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "Die Adresse wird bereits von Benutzer '%s' verwendet."
 
-#: admin/groups/mailaddress/class_groupMail.inc:265
-#: admin/groups/mailaddress/class_groupMail.inc:322
+#: admin/groups/mailaddress/class_groupMail.inc:262
+#: admin/groups/mailaddress/class_groupMail.inc:319
 #: personal/mailaddress/class_mailAccount.inc:212
 #: personal/mailaddress/class_mailAccount.inc:244
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/groups/mailaddress/class_groupMail.inc:480
+#: admin/groups/mailaddress/class_groupMail.inc:475
 msgid "Group mail"
 msgstr "Mail der Gruppe"
 
-#: admin/groups/mailaddress/class_groupMail.inc:488
+#: admin/groups/mailaddress/class_groupMail.inc:483
 msgid "Alternate addresses"
 msgstr "Alternative Adressen"
 
-#: admin/groups/mailaddress/class_groupMail.inc:489
+#: admin/groups/mailaddress/class_groupMail.inc:484
 msgid "Forwarding addresses"
 msgstr "Weiterleitungsadressen"
 
-#: admin/groups/mailaddress/class_groupMail.inc:490
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: admin/groups/mailaddress/class_groupMail.inc:539
+#: admin/groups/mailaddress/class_groupMail.inc:533
 #: admin/groups/mailaddress/mailaddress.tpl:27
 #: personal/mailaddress/class_mailAccount.inc:382
 #: personal/mailaddress/class_mailAccount.inc:385
@@ -112,7 +108,7 @@ msgstr "Berechtigungen"
 msgid "Mail address pattern"
 msgstr "Mail-Adressschema"
 
-#: admin/groups/mailaddress/class_groupMail.inc:539
+#: admin/groups/mailaddress/class_groupMail.inc:533
 #, php-format
 msgid ""
 "Please make use of the {%cn} placeholder for the group part of the mail "
@@ -139,11 +135,11 @@ msgstr "Mail-Adresseinstellungen"
 #: admin/groups/mailaddress/mailaddress.tpl:22
 #, php-format
 msgid ""
-"Please specify a mail address pattern (e.g., {ldelim}%cn{rdelim}@your-domain."
+"Please specify a mail address pattern (e.g., {%cn|@your-domain."
 "com) or leave empty."
 msgstr ""
-"Bitte ein Mail-Adressschema eingeben (z.Bsp. {ldelim}%cn{rdelim}@your-"
-"domain.com) oder das Feld frei lassen."
+"Bitte ein Mail-Adressschema eingeben (z.Bsp. {%cn|@your-domain."
+"com) oder das Feld frei lassen."
 
 #: admin/groups/mailaddress/mailaddress.tpl:42
 #: admin/groups/mailaddress/paste_mailaddress.tpl:26
@@ -232,11 +228,15 @@ msgid "Mail addresses"
 msgstr "Mail-Adresse"
 
 #: personal/mailaddress/generic.tpl:21
+#, fuzzy
 msgid ""
-"Please specify a mail address pattern (e.g., {ldelim}%uid{rdelim}@your-"
-"domain.com). Valid placeholders are: {ldelim}%uid{rdelim}, "
-"{ldelim}%givenName{rdelim} and {ldelim}%sn{rdelim}."
+"Please specify a mail address pattern (e.g., {%uid|@your-domain."
+"com). Valid placeholders are: {%uid|, {%givenName| and "
+"{%sn|."
 msgstr ""
-"Bitte ein Mail-Adressschema eingeben (z.Bsp. {ldelim}%uid{rdelim}@your-"
-"domain.com). Gültige Platzhalter sind: {ldelim}%uid{rdelim}, "
-"{ldelim}%givenName{rdelim} und {ldelim}%sn{rdelim}."
+"Bitte ein Mail-Adressschema eingeben (z.Bsp. {%uid|@your-"
+"domain.com). Gültige Platzhalter sind: {%uid|, "
+"{%givenName| und {%sn|."
+
+#~ msgid "Permissions"
+#~ msgstr "Berechtigungen"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 53e2504..4ff4322 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-#: admin/groups/mailaddress/class_groupMail.inc:94
-#: admin/groups/mailaddress/class_groupMail.inc:96
-#: admin/groups/mailaddress/class_groupMail.inc:479
+#: admin/groups/mailaddress/class_groupMail.inc:91
+#: admin/groups/mailaddress/class_groupMail.inc:93
+#: admin/groups/mailaddress/class_groupMail.inc:474
 #: personal/mailaddress/class_mailAccount.inc:120
 #: personal/mailaddress/class_mailAccount.inc:122
 #: personal/mailaddress/class_mailAccount.inc:375
@@ -8,28 +8,28 @@
 msgid "Mail"
 msgstr "Mail"
 
-#: admin/groups/mailaddress/class_groupMail.inc:123
-#: admin/groups/mailaddress/class_groupMail.inc:147
-#: admin/groups/mailaddress/class_groupMail.inc:153
-#: admin/groups/mailaddress/class_groupMail.inc:179
-#: admin/groups/mailaddress/class_groupMail.inc:185
-#: admin/groups/mailaddress/class_groupMail.inc:199
+#: admin/groups/mailaddress/class_groupMail.inc:120
+#: admin/groups/mailaddress/class_groupMail.inc:144
+#: admin/groups/mailaddress/class_groupMail.inc:150
+#: admin/groups/mailaddress/class_groupMail.inc:176
+#: admin/groups/mailaddress/class_groupMail.inc:182
+#: admin/groups/mailaddress/class_groupMail.inc:196
 msgid "Error"
 msgstr "Error"
 
-#: admin/groups/mailaddress/class_groupMail.inc:123
+#: admin/groups/mailaddress/class_groupMail.inc:120
 msgid "Please select an entry!"
 msgstr "Please select an entry!"
 
-#: admin/groups/mailaddress/class_groupMail.inc:147
-#: admin/groups/mailaddress/class_groupMail.inc:179
-#: admin/groups/mailaddress/class_groupMail.inc:185
-#: admin/groups/mailaddress/class_groupMail.inc:199
-#: admin/groups/mailaddress/class_groupMail.inc:356
-#: admin/groups/mailaddress/class_groupMail.inc:359
-#: admin/groups/mailaddress/class_groupMail.inc:361
-#: admin/groups/mailaddress/class_groupMail.inc:373
-#: admin/groups/mailaddress/class_groupMail.inc:487
+#: admin/groups/mailaddress/class_groupMail.inc:144
+#: admin/groups/mailaddress/class_groupMail.inc:176
+#: admin/groups/mailaddress/class_groupMail.inc:182
+#: admin/groups/mailaddress/class_groupMail.inc:196
+#: admin/groups/mailaddress/class_groupMail.inc:352
+#: admin/groups/mailaddress/class_groupMail.inc:355
+#: admin/groups/mailaddress/class_groupMail.inc:357
+#: admin/groups/mailaddress/class_groupMail.inc:368
+#: admin/groups/mailaddress/class_groupMail.inc:482
 #: admin/groups/mailaddress/mailaddress.tpl:10
 #: admin/groups/mailaddress/paste_mailaddress.tpl:9
 #: personal/mailaddress/class_mailAccount.inc:283
@@ -42,46 +42,42 @@ msgstr "Please select an entry!"
 msgid "Mail address"
 msgstr "Mail address"
 
-#: admin/groups/mailaddress/class_groupMail.inc:153
+#: admin/groups/mailaddress/class_groupMail.inc:150
 msgid "Cannot add primary address to the list of forwarders!"
 msgstr "Cannot add primary address to the list of forwarders!"
 
-#: admin/groups/mailaddress/class_groupMail.inc:195
+#: admin/groups/mailaddress/class_groupMail.inc:192
 #: personal/mailaddress/class_mailAccount.inc:309
 #, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "Address is already in use by group '%s'."
 
-#: admin/groups/mailaddress/class_groupMail.inc:197
+#: admin/groups/mailaddress/class_groupMail.inc:194
 #: personal/mailaddress/class_mailAccount.inc:311
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "Address is already in use by user '%s'."
 
-#: admin/groups/mailaddress/class_groupMail.inc:265
-#: admin/groups/mailaddress/class_groupMail.inc:322
+#: admin/groups/mailaddress/class_groupMail.inc:262
+#: admin/groups/mailaddress/class_groupMail.inc:319
 #: personal/mailaddress/class_mailAccount.inc:212
 #: personal/mailaddress/class_mailAccount.inc:244
 msgid "LDAP error"
 msgstr "LDAP error"
 
-#: admin/groups/mailaddress/class_groupMail.inc:480
+#: admin/groups/mailaddress/class_groupMail.inc:475
 msgid "Group mail"
 msgstr "Group mail"
 
-#: admin/groups/mailaddress/class_groupMail.inc:488
+#: admin/groups/mailaddress/class_groupMail.inc:483
 msgid "Alternate addresses"
 msgstr "Alternate addresses"
 
-#: admin/groups/mailaddress/class_groupMail.inc:489
+#: admin/groups/mailaddress/class_groupMail.inc:484
 msgid "Forwarding addresses"
 msgstr "Forwarding addresses"
 
-#: admin/groups/mailaddress/class_groupMail.inc:490
-msgid "Permissions"
-msgstr "Permissions"
-
-#: admin/groups/mailaddress/class_groupMail.inc:539
+#: admin/groups/mailaddress/class_groupMail.inc:533
 #: admin/groups/mailaddress/mailaddress.tpl:27
 #: personal/mailaddress/class_mailAccount.inc:382
 #: personal/mailaddress/class_mailAccount.inc:385
@@ -89,7 +85,7 @@ msgstr "Permissions"
 msgid "Mail address pattern"
 msgstr "Mail address pattern"
 
-#: admin/groups/mailaddress/class_groupMail.inc:539
+#: admin/groups/mailaddress/class_groupMail.inc:533
 #, php-format
 msgid ""
 "Please make use of the {%cn} placeholder for the group part of the mail "
@@ -117,10 +113,10 @@ msgstr "Mail address settings"
 #: admin/groups/mailaddress/mailaddress.tpl:22
 #, php-format
 msgid ""
-"Please specify a mail address pattern (e.g., {ldelim}%cn{rdelim}@your-domain."
+"Please specify a mail address pattern (e.g., {%cn|@your-domain."
 "com) or leave empty."
 msgstr ""
-"Please specify a mail address pattern (e.g., {ldelim}%cn{rdelim}@your-domain."
+"Please specify a mail address pattern (e.g., {%cn|@your-domain."
 "com) or leave empty."
 
 #: admin/groups/mailaddress/mailaddress.tpl:42
@@ -210,11 +206,15 @@ msgid "Mail addresses"
 msgstr "Mail addresses"
 
 #: personal/mailaddress/generic.tpl:21
+#, fuzzy
 msgid ""
-"Please specify a mail address pattern (e.g., {ldelim}%uid{rdelim}@your-"
-"domain.com). Valid placeholders are: {ldelim}%uid{rdelim}, "
-"{ldelim}%givenName{rdelim} and {ldelim}%sn{rdelim}."
+"Please specify a mail address pattern (e.g., {%uid|@your-domain."
+"com). Valid placeholders are: {%uid|, {%givenName| and "
+"{%sn|."
 msgstr ""
-"Please specify a mail address pattern (e.g., {ldelim}%uid{rdelim}@your-"
-"domain.com). Valid placeholders are: {ldelim}%uid{rdelim}, "
-"{ldelim}%givenName{rdelim} and {ldelim}%sn{rdelim}."
+"Please specify a mail address pattern (e.g., {%uid|@your-"
+"domain.com). Valid placeholders are: {%uid|, "
+"{%givenName| and {%sn|."
+
+#~ msgid "Permissions"
+#~ msgstr "Permissions"
diff --git a/locale/messages.po b/locale/messages.po
index 7265f20..875b0db 100644
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-26 21:28+0200\n"
+"POT-Creation-Date: 2015-08-27 00:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/groups/mailaddress/class_groupMail.inc:94
-#: admin/groups/mailaddress/class_groupMail.inc:96
-#: admin/groups/mailaddress/class_groupMail.inc:479
+#: admin/groups/mailaddress/class_groupMail.inc:91
+#: admin/groups/mailaddress/class_groupMail.inc:93
+#: admin/groups/mailaddress/class_groupMail.inc:474
 #: personal/mailaddress/class_mailAccount.inc:120
 #: personal/mailaddress/class_mailAccount.inc:122
 #: personal/mailaddress/class_mailAccount.inc:375
@@ -27,28 +27,28 @@ msgstr ""
 msgid "Mail"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:123
-#: admin/groups/mailaddress/class_groupMail.inc:147
-#: admin/groups/mailaddress/class_groupMail.inc:153
-#: admin/groups/mailaddress/class_groupMail.inc:179
-#: admin/groups/mailaddress/class_groupMail.inc:185
-#: admin/groups/mailaddress/class_groupMail.inc:199
+#: admin/groups/mailaddress/class_groupMail.inc:120
+#: admin/groups/mailaddress/class_groupMail.inc:144
+#: admin/groups/mailaddress/class_groupMail.inc:150
+#: admin/groups/mailaddress/class_groupMail.inc:176
+#: admin/groups/mailaddress/class_groupMail.inc:182
+#: admin/groups/mailaddress/class_groupMail.inc:196
 msgid "Error"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:123
+#: admin/groups/mailaddress/class_groupMail.inc:120
 msgid "Please select an entry!"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:147
-#: admin/groups/mailaddress/class_groupMail.inc:179
-#: admin/groups/mailaddress/class_groupMail.inc:185
-#: admin/groups/mailaddress/class_groupMail.inc:199
-#: admin/groups/mailaddress/class_groupMail.inc:356
-#: admin/groups/mailaddress/class_groupMail.inc:359
-#: admin/groups/mailaddress/class_groupMail.inc:361
-#: admin/groups/mailaddress/class_groupMail.inc:373
-#: admin/groups/mailaddress/class_groupMail.inc:487
+#: admin/groups/mailaddress/class_groupMail.inc:144
+#: admin/groups/mailaddress/class_groupMail.inc:176
+#: admin/groups/mailaddress/class_groupMail.inc:182
+#: admin/groups/mailaddress/class_groupMail.inc:196
+#: admin/groups/mailaddress/class_groupMail.inc:352
+#: admin/groups/mailaddress/class_groupMail.inc:355
+#: admin/groups/mailaddress/class_groupMail.inc:357
+#: admin/groups/mailaddress/class_groupMail.inc:368
+#: admin/groups/mailaddress/class_groupMail.inc:482
 #: admin/groups/mailaddress/mailaddress.tpl:10
 #: admin/groups/mailaddress/paste_mailaddress.tpl:9
 #: personal/mailaddress/class_mailAccount.inc:283
@@ -61,46 +61,42 @@ msgstr ""
 msgid "Mail address"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:153
+#: admin/groups/mailaddress/class_groupMail.inc:150
 msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:195
+#: admin/groups/mailaddress/class_groupMail.inc:192
 #: personal/mailaddress/class_mailAccount.inc:309
 #, php-format
 msgid "Address is already in use by group '%s'."
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:197
+#: admin/groups/mailaddress/class_groupMail.inc:194
 #: personal/mailaddress/class_mailAccount.inc:311
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:265
-#: admin/groups/mailaddress/class_groupMail.inc:322
+#: admin/groups/mailaddress/class_groupMail.inc:262
+#: admin/groups/mailaddress/class_groupMail.inc:319
 #: personal/mailaddress/class_mailAccount.inc:212
 #: personal/mailaddress/class_mailAccount.inc:244
 msgid "LDAP error"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:480
+#: admin/groups/mailaddress/class_groupMail.inc:475
 msgid "Group mail"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:488
+#: admin/groups/mailaddress/class_groupMail.inc:483
 msgid "Alternate addresses"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:489
+#: admin/groups/mailaddress/class_groupMail.inc:484
 msgid "Forwarding addresses"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:490
-msgid "Permissions"
-msgstr ""
-
-#: admin/groups/mailaddress/class_groupMail.inc:539
+#: admin/groups/mailaddress/class_groupMail.inc:533
 #: admin/groups/mailaddress/mailaddress.tpl:27
 #: personal/mailaddress/class_mailAccount.inc:382
 #: personal/mailaddress/class_mailAccount.inc:385
@@ -108,7 +104,7 @@ msgstr ""
 msgid "Mail address pattern"
 msgstr ""
 
-#: admin/groups/mailaddress/class_groupMail.inc:539
+#: admin/groups/mailaddress/class_groupMail.inc:533
 #, php-format
 msgid ""
 "Please make use of the {%cn} placeholder for the group part of the mail "
@@ -134,7 +130,7 @@ msgstr ""
 #: admin/groups/mailaddress/mailaddress.tpl:22
 #, php-format
 msgid ""
-"Please specify a mail address pattern (e.g., {ldelim}%cn{rdelim}@your-domain."
+"Please specify a mail address pattern (e.g., {%cn|@your-domain."
 "com) or leave empty."
 msgstr ""
 
@@ -226,7 +222,7 @@ msgstr ""
 
 #: personal/mailaddress/generic.tpl:21
 msgid ""
-"Please specify a mail address pattern (e.g., {ldelim}%uid{rdelim}@your-"
-"domain.com). Valid placeholders are: {ldelim}%uid{rdelim}, "
-"{ldelim}%givenName{rdelim} and {ldelim}%sn{rdelim}."
+"Please specify a mail address pattern (e.g., {%uid|@your-domain."
+"com). Valid placeholders are: {%uid|, {%givenName| and "
+"{%sn|."
 msgstr ""
diff --git a/personal/mailaddress/generic.tpl b/personal/mailaddress/generic.tpl
index 8fb1430..be1a1fd 100644
--- a/personal/mailaddress/generic.tpl
+++ b/personal/mailaddress/generic.tpl
@@ -18,7 +18,7 @@
    <h3>{t}User Mail Addresses{/t}</h3>
    <table summary="{t}Mail addresses{/t}">
     <tr>
-    <td colspan="2"><i>{t}Please specify a mail address pattern (e.g., {ldelim}%uid{rdelim}@your-domain.com). Valid placeholders are: {ldelim}%uid{rdelim}, {ldelim}%givenName{rdelim} and {ldelim}%sn{rdelim}.{/t}</i>
+    <td colspan="2"><i>{t}Please specify a mail address pattern (e.g., {%uid|@your-domain.com). Valid placeholders are: {%uid|, {%givenName| and {%sn|.{/t}</i>
     </td>
     </tr>
     <tr><td> </td></tr>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/gosa-plugin-mailaddress.git

More information about the debian-edu-commits mailing list