diff --git a/alias/admin/alias/class_aliasManagement.inc b/alias/admin/alias/class_aliasManagement.inc
index e013cf7bfae75df01135528c6df9ee5675f737ff..3a13ea7565a05bdf9bfa008ff421066770296238 100644
--- a/alias/admin/alias/class_aliasManagement.inc
+++ b/alias/admin/alias/class_aliasManagement.inc
@@ -22,7 +22,7 @@
 class aliasManagement extends simpleManagement
 {
   // Tab definition
-  protected $objectTypes  = array('mailAliasDistribution','mailAliasRedirection','sympaAlias');
+  protected $objectTypes  = array('mailAliasDistribution','mailAliasRedirection');
 
   protected $autoFilterAttributes = array('dn', 'cn', 'description', 'aliasExpirationDate');
 
@@ -36,8 +36,8 @@ class aliasManagement extends simpleManagement
       'plSection'     => 'accounts',
       'plPriority'    => 26,
       'plCategory'    => array('alias' => array('description'  => _('Mail aliases'),
-                                                'objectClass'  => array('mailAliasRedirection','mailAliasDistribution','sympaAlias'))),
-      'plManages'     => array('mailAliasDistribution','mailAliasRedirection','sympaAlias'),
+                                                'objectClass'  => array('mailAliasRedirection','mailAliasDistribution'))),
+      'plManages'     => array('mailAliasDistribution','mailAliasRedirection'),
 
       'plProvidedAcls' => array()
     );
diff --git a/alias/locale/ar/fusiondirectory.po b/alias/locale/ar/fusiondirectory.po
index e2ca262c687dae74ec12e522aa0247986eade3f5..a9fc9783e8f6190460eb399d549d5cdf8153846e 100644
--- a/alias/locale/ar/fusiondirectory.po
+++ b/alias/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/alias/locale/ca/fusiondirectory.po b/alias/locale/ca/fusiondirectory.po
index 20bf3168cbc0e64eb4d41c1e6953168e122ac098..05e7110770e11c4df14c4e20cb93380bbfd4ab5a 100644
--- a/alias/locale/ca/fusiondirectory.po
+++ b/alias/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/alias/locale/cs_CZ/fusiondirectory.po b/alias/locale/cs_CZ/fusiondirectory.po
index 3e76d29f34016c4ca078fc9dc71816481880bd4a..856448888f44fa8ab9b85a1ee1fbd7a859b09cb0 100644
--- a/alias/locale/cs_CZ/fusiondirectory.po
+++ b/alias/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/alias/locale/de/fusiondirectory.po b/alias/locale/de/fusiondirectory.po
index 78861586fb4bc076bf03cf663416be39a0bf7252..24f2166f19eb55b1e230a2791b7bacd922a252bc 100644
--- a/alias/locale/de/fusiondirectory.po
+++ b/alias/locale/de/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: d.oertel <d.oertel@uib.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -131,7 +131,7 @@ msgstr "Mail-Server"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
-msgstr ""
+msgstr "Mailserver für diesen Alias"
 
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
diff --git a/alias/locale/el_GR/fusiondirectory.po b/alias/locale/el_GR/fusiondirectory.po
index 4c24517653366fa55140ec2678557589a01b039e..3c3b20ab5e77722154bdcddbdc615a3d934c49f3 100644
--- a/alias/locale/el_GR/fusiondirectory.po
+++ b/alias/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/alias/locale/en/fusiondirectory.po b/alias/locale/en/fusiondirectory.po
index 842fef5769a70e51022dfce0344e730b27d73091..8c8b695b7f034b4787931256e3903946cf21ca42 100644
--- a/alias/locale/en/fusiondirectory.po
+++ b/alias/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/alias/locale/es/fusiondirectory.po b/alias/locale/es/fusiondirectory.po
index 7818ca11cb2760416e725036d5a2c84f44e88be7..98ea46663008219a784469051b2c103dda921a1b 100644
--- a/alias/locale/es/fusiondirectory.po
+++ b/alias/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/alias/locale/es_CO/fusiondirectory.po b/alias/locale/es_CO/fusiondirectory.po
index 47cb3528e85a4e1ead64fe8e3383476f10baa9ac..ca7cac2c4e11f002ad328d2cd73258dcab2ced30 100644
--- a/alias/locale/es_CO/fusiondirectory.po
+++ b/alias/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/alias/locale/es_VE/fusiondirectory.po b/alias/locale/es_VE/fusiondirectory.po
index 3aa144d69e7d67a3d0d0c8660831e9e2cfc0ee80..5af916e2479d7ed2856bb11bfdbcaf3d27d828f2 100644
--- a/alias/locale/es_VE/fusiondirectory.po
+++ b/alias/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/alias/locale/fa_IR/fusiondirectory.po b/alias/locale/fa_IR/fusiondirectory.po
index 4bec125d5fa78553b335a7a96028182c5970a6d8..19c3e683f7dbda16dcc2df92aa2773b67adcab98 100644
--- a/alias/locale/fa_IR/fusiondirectory.po
+++ b/alias/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/fi_FI/fusiondirectory.po b/alias/locale/fi_FI/fusiondirectory.po
index 9781a85b830e99d9b7b0ed80c3f44a85d1e04ece..40347649c0ea40ff4cf8d0060255489ca4764c8a 100644
--- a/alias/locale/fi_FI/fusiondirectory.po
+++ b/alias/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/alias/locale/fr/fusiondirectory.po b/alias/locale/fr/fusiondirectory.po
index b6f524bee81c43eb37af09b540049bee3b6160a2..01a8ad328fdb6dc00555c4b0e3b63ab949c91475 100644
--- a/alias/locale/fr/fusiondirectory.po
+++ b/alias/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: config/alias/class_aliasConfig.inc:28
 msgid "Alias configuration"
-msgstr "Configuration des alias"
+msgstr "Configuration alias"
 
 #: config/alias/class_aliasConfig.inc:29
 msgid "FusionDirectory alias plugin configuration"
@@ -32,21 +32,21 @@ msgstr "Alias"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Alias RDN"
-msgstr "Alias RDN"
+msgstr "Branche des alias"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Branch in which aliases will be stored"
-msgstr "Branche dans laquelle les alias sont stockés"
+msgstr "Branche dans laquelle les alias seront stockés"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
 #: admin/alias/class_mailAliasRedirection.inc:35
 msgid "Temporary mail redirection"
-msgstr "Adresse de redirection temporaire"
+msgstr "Redirection temporaire de courriel"
 
 #: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
-msgstr "Redirection de messagerie"
+msgstr "Redirection de courriel"
 
 #: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
@@ -55,7 +55,7 @@ msgstr "Nom"
 
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
-msgstr "Nom de la redirection de messagerie"
+msgstr "Nom de la redirection de courriel"
 
 #: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
@@ -72,7 +72,7 @@ msgstr "Rediriger depuis"
 
 #: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
-msgstr "Adresse de messagerie depuis laquelle vous voulez rediriger"
+msgstr "Adresse de courriel depuis laquelle vous voulez rediriger"
 
 #: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
@@ -92,18 +92,18 @@ msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr ""
-"Date après laquelle cet alias doit être effacé. laisser vide pour aucune "
-"expiration"
+"Date après laquelle cette redirection doit être supprimée. Laisser vide pour"
+" ne jamais expirer."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
 #: admin/alias/class_mailAliasDistribution.inc:35
 msgid "Temporary mail distribution"
-msgstr "Adresse de distribution temporaire"
+msgstr "Distribution temporaire de courriel"
 
 #: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
-msgstr "Redistribution de messagerie"
+msgstr "Redistribution de courriel"
 
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
@@ -115,30 +115,30 @@ msgstr "Description de l'alias"
 
 #: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
-msgstr "Adresse de messagerie"
+msgstr "Adresse de courriel"
 
 #: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
-msgstr "Alias de messagerie"
+msgstr "Alias de courriel"
 
 #: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
-msgstr "Alias pour cette adresse de messagerie"
+msgstr "Alias pour cette adresse de courriel"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
-msgstr "Serveur de messagerie"
+msgstr "Serveur de courriel"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
-msgstr "Serveur de messagerie pour cet alias"
+msgstr "Serveur de courriel pour cet alias"
 
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
-"Date après laquelle cet alias doit être effacé. laisser vide pour aucune "
-"expiration"
+"Date après laquelle cet alias doit être supprimé. Laisser vide pour ne "
+"jamais expirer."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
@@ -150,4 +150,4 @@ msgstr "Gestion des alias"
 
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
-msgstr "Alias de messagerie"
+msgstr "Alias de courriel"
diff --git a/alias/locale/hu_HU/fusiondirectory.po b/alias/locale/hu_HU/fusiondirectory.po
index 9a602324c4af2e3c4ad227a01489e9d8a11b2004..edf2cdc9d16f0884f437a45b398700a4b8176800 100644
--- a/alias/locale/hu_HU/fusiondirectory.po
+++ b/alias/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/alias/locale/id/fusiondirectory.po b/alias/locale/id/fusiondirectory.po
index 90e8acf0c7f27a8c0445de963a9eeae6ae9a4390..1e9f85b58ab8d104e8af76a33289b20754e053af 100644
--- a/alias/locale/id/fusiondirectory.po
+++ b/alias/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/it_IT/fusiondirectory.po b/alias/locale/it_IT/fusiondirectory.po
index 7c7b574c7447a0d8a4f7cc4d47a4591e8bca9e00..0eae7e999bfb6d62d2daf7beaa29d60c6c5c89b4 100644
--- a/alias/locale/it_IT/fusiondirectory.po
+++ b/alias/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/alias/locale/lv/fusiondirectory.po b/alias/locale/lv/fusiondirectory.po
index 55aa0cbf22428e18999d1ef3477fa4d8ae08dbc1..1f0f9da86fa2b0d49270004a63f4852a9c84d8ea 100644
--- a/alias/locale/lv/fusiondirectory.po
+++ b/alias/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/alias/locale/nb/fusiondirectory.po b/alias/locale/nb/fusiondirectory.po
index 21b4ccb58b12533ab2bda3cd425a878d012a025b..d5c5e3fa6d216175e525a99d96645defe92dcc05 100644
--- a/alias/locale/nb/fusiondirectory.po
+++ b/alias/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/alias/locale/nl/fusiondirectory.po b/alias/locale/nl/fusiondirectory.po
index c76d221974810d8b6631130b2b9fa1c0ad4482ec..761c2c22af1f6ddd62a4fc962e5e246303c027a3 100644
--- a/alias/locale/nl/fusiondirectory.po
+++ b/alias/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Joeri Puttevils <joeri.puttevils@connict.net>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -142,12 +142,12 @@ msgstr ""
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
-msgstr "Alias"
+msgstr "Aliassen"
 
 #: admin/alias/class_aliasManagement.inc:34
 msgid "Alias management"
-msgstr "Alias beheer"
+msgstr "Aliasbeheer"
 
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
-msgstr "Email aliases"
+msgstr "E-mail-aliassen"
diff --git a/alias/locale/pl/fusiondirectory.po b/alias/locale/pl/fusiondirectory.po
index f30b97c1f0d4f70ab6df9576a9bcaee28859327a..200c0257e55922090bea8f9a0075e4c85b1d3d94 100644
--- a/alias/locale/pl/fusiondirectory.po
+++ b/alias/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/alias/class_aliasConfig.inc:28
 msgid "Alias configuration"
diff --git a/alias/locale/pt/fusiondirectory.po b/alias/locale/pt/fusiondirectory.po
index 33f78bac8fd564c35ea56eb6e027f66085baa31a..e9d6937b7178954effa9f73d4a8e5c5b8acbeebe 100644
--- a/alias/locale/pt/fusiondirectory.po
+++ b/alias/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/alias/locale/pt_BR/fusiondirectory.po b/alias/locale/pt_BR/fusiondirectory.po
index 13f5332e022217604a044b6d3a0e2d8be1f05521..203c27eb237db43b15b9e49933586417202ac7ef 100644
--- a/alias/locale/pt_BR/fusiondirectory.po
+++ b/alias/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/alias/locale/ru/fusiondirectory.po b/alias/locale/ru/fusiondirectory.po
index e6e9c8ecf1489504754fb57ce8bb6d35cc5286e8..30f5e1e2cf8215c4aea4b3fc6b548d6703f305c4 100644
--- a/alias/locale/ru/fusiondirectory.po
+++ b/alias/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/alias/locale/ru@petr1708/fusiondirectory.po b/alias/locale/ru@petr1708/fusiondirectory.po
index e63a25a6d5cca31cdad16c1455ad5de284b1aafc..30887ce39c56f6f10490a8f2b1c5991241d13a33 100644
--- a/alias/locale/ru@petr1708/fusiondirectory.po
+++ b/alias/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/sv/fusiondirectory.po b/alias/locale/sv/fusiondirectory.po
index 3701b87a8b6c8273deb733b929dcb6bb1b9036ce..56f429f2d01d1e3493174da8a6db55fd57903133 100644
--- a/alias/locale/sv/fusiondirectory.po
+++ b/alias/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/alias/locale/ug/fusiondirectory.po b/alias/locale/ug/fusiondirectory.po
index 23835147d985857b185901ddfa5526f6e00d8ca1..d5c14f7050cdbdde82382690b1499046c5fb0e23 100644
--- a/alias/locale/ug/fusiondirectory.po
+++ b/alias/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/vi_VN/fusiondirectory.po b/alias/locale/vi_VN/fusiondirectory.po
index da731fe4f854bf80b76dda85f28e9afa00fb570f..8b87f5ec38139c42de66355ed59e6e3b61639de2 100644
--- a/alias/locale/vi_VN/fusiondirectory.po
+++ b/alias/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/alias/locale/zh/fusiondirectory.po b/alias/locale/zh/fusiondirectory.po
index 54417d2e010d03eaba80fe061b82aae5bfdc4433..234a29fa49f7e3838e4097cf616343bf007f3511 100644
--- a/alias/locale/zh/fusiondirectory.po
+++ b/alias/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/applications/locale/ar/fusiondirectory.po b/applications/locale/ar/fusiondirectory.po
index ae7e5e8d260f33a9cccdb23f292f69525e16592b..124bf14eb70cab3e1e9ea230555d72945fe549c7 100644
--- a/applications/locale/ar/fusiondirectory.po
+++ b/applications/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/applications/locale/ca/fusiondirectory.po b/applications/locale/ca/fusiondirectory.po
index 143640e3813e702157e34c44b67f321380173013..ca942cbf1fe7a3a3c4e4306bcafd0b86bbc649d2 100644
--- a/applications/locale/ca/fusiondirectory.po
+++ b/applications/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/applications/locale/cs_CZ/fusiondirectory.po b/applications/locale/cs_CZ/fusiondirectory.po
index d2e4eeca50bb4be9c81c4aa0a7cd86e4819f9115..3af9589f3875154bafcbc84892bd1a56486276a1 100644
--- a/applications/locale/cs_CZ/fusiondirectory.po
+++ b/applications/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/applications/locale/de/fusiondirectory.po b/applications/locale/de/fusiondirectory.po
index 854a4e1d753bc2950772fabb21e2b35f457852cc..d5604c8168bb8f82cc565e8449f15e2de8b4661f 100644
--- a/applications/locale/de/fusiondirectory.po
+++ b/applications/locale/de/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: d.oertel <d.oertel@uib.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@ msgstr "Anwendungen"
 
 #: config/applications/class_applicationsPluginConfig.inc:29
 msgid "Applications plugin configuration"
-msgstr ""
+msgstr "Konfiguration des Anwendungsplugin"
 
 #: config/applications/class_applicationsPluginConfig.inc:43
 msgid "Application RDN"
@@ -40,11 +40,11 @@ msgstr "Zweig in welchem Anwendungen gespeichert werden"
 
 #: config/applications/class_applicationsPluginConfig.inc:48
 msgid "Web applications RDN"
-msgstr ""
+msgstr "Webanwendungs RDN"
 
 #: config/applications/class_applicationsPluginConfig.inc:48
 msgid "Branch in which web applications will be stored"
-msgstr ""
+msgstr "Zweig in welchem Webanwendungen gespeichert werden "
 
 #: config/applications/class_applicationsPluginConfig.inc:53
 msgid "Show web applications in menu"
@@ -52,7 +52,7 @@ msgstr "Webanwendungen im Menü anzeigen"
 
 #: config/applications/class_applicationsPluginConfig.inc:53
 msgid "Whether to show web applications in FD main menu"
-msgstr ""
+msgstr "Webanwendungen im FD Hauptmenü anzeigen"
 
 #: config/applications/class_applicationsPluginConfig.inc:56
 msgid "None"
@@ -177,7 +177,7 @@ msgstr "Web Anwendung"
 
 #: admin/applications/class_webApplication.inc:29
 msgid "Web applicationts names, icons and links"
-msgstr ""
+msgstr "Name, Icons und Links der Webanwendung"
 
 #: admin/applications/class_webApplication.inc:49
 msgid "Name"
@@ -193,7 +193,7 @@ msgstr "URL"
 
 #: admin/applications/class_webApplication.inc:57
 msgid "Link to this application"
-msgstr ""
+msgstr "Link zu dieser Anwendung"
 
 #: admin/applications/class_webApplication.inc:61
 msgid "Display Name"
@@ -201,15 +201,15 @@ msgstr "Anzeigename"
 
 #: admin/applications/class_webApplication.inc:61
 msgid "Displayed name for links to this application"
-msgstr ""
+msgstr "Anzeigename des Links zu dieser Anwendung"
 
 #: admin/applications/class_webApplication.inc:75
 msgid "Icon location"
-msgstr ""
+msgstr "Speicherort der Icons"
 
 #: admin/applications/class_webApplication.inc:75
 msgid "Usual path to this application icon"
-msgstr ""
+msgstr "Üblicher Pfad zu diesem Anwendungsicon"
 
 #: admin/roles/class_applicationRights.inc:31
 msgid "Applications allowed for this role"
@@ -221,4 +221,4 @@ msgstr "Anwendungsliste"
 
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
-msgstr ""
+msgstr "Die Anwendungsbenutzer dieser Rolle dürfen starten"
diff --git a/applications/locale/el_GR/fusiondirectory.po b/applications/locale/el_GR/fusiondirectory.po
index 5b2981e6e0ae47f0295095723f22b94e3350be85..9640bc735d39da29e6926a70b3160a2bc051109a 100644
--- a/applications/locale/el_GR/fusiondirectory.po
+++ b/applications/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/applications/locale/en/fusiondirectory.po b/applications/locale/en/fusiondirectory.po
index b529039d01058f7812dc2659e2a11c6fd3b7ad87..4a0f2d7e0a747a428d641ca7c2cb7ed34857a49e 100644
--- a/applications/locale/en/fusiondirectory.po
+++ b/applications/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/applications/locale/es/fusiondirectory.po b/applications/locale/es/fusiondirectory.po
index 02f0bc6d78e10b16428c202dc88b4747632a6572..b2b5920a9dd0033d118961763517798dd2df71aa 100644
--- a/applications/locale/es/fusiondirectory.po
+++ b/applications/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/applications/locale/es_CO/fusiondirectory.po b/applications/locale/es_CO/fusiondirectory.po
index c08a6244f68696ae1a59033cbc8b2a7cf247152e..37fe9bf86282e4fa940f6a336200d8ac1b7fddaf 100644
--- a/applications/locale/es_CO/fusiondirectory.po
+++ b/applications/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/applications/locale/es_VE/fusiondirectory.po b/applications/locale/es_VE/fusiondirectory.po
index 06cbd947d6bde39c06e6ab3c7a4b926e8fee588c..3fe94306cfc0034b86519790728f37adecaeb082 100644
--- a/applications/locale/es_VE/fusiondirectory.po
+++ b/applications/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/applications/locale/fa_IR/fusiondirectory.po b/applications/locale/fa_IR/fusiondirectory.po
index 5ef886f9e6e764072a367b68cceb4ed5342a815b..3ecd658a648a49cf2f4805c9db63f6af81169010 100644
--- a/applications/locale/fa_IR/fusiondirectory.po
+++ b/applications/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/fi_FI/fusiondirectory.po b/applications/locale/fi_FI/fusiondirectory.po
index faffe09af2d711913a5ecb18fac2e6197b730eaf..94c3b986504df19257a48843f838a2112187f650 100644
--- a/applications/locale/fi_FI/fusiondirectory.po
+++ b/applications/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/applications/locale/fr/fusiondirectory.po b/applications/locale/fr/fusiondirectory.po
index 71f97054912c3a98a53da557f63e7e2a6a868402..b53df3123f3bdfdb4ca96262d5e67c85d2a586ec 100644
--- a/applications/locale/fr/fusiondirectory.po
+++ b/applications/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -56,7 +56,7 @@ msgstr "S’il faut afficher les applications web dans le menu principal de FD"
 
 #: config/applications/class_applicationsPluginConfig.inc:56
 msgid "None"
-msgstr "Aucun"
+msgstr "Aucune"
 
 #: config/applications/class_applicationsPluginConfig.inc:56
 msgid "Only allowed"
@@ -79,7 +79,7 @@ msgstr "Applications web"
 #: admin/applications/class_applicationGeneric.inc:46
 #: admin/applications/class_webApplication.inc:45
 msgid "Application"
-msgstr "Applications"
+msgstr "Application"
 
 #: admin/applications/class_applicationGeneric.inc:30
 msgid "Application information"
@@ -143,7 +143,7 @@ msgstr "Exécutable uniquement par les membres du groupe"
 
 #: admin/applications/class_applicationGeneric.inc:86
 msgid "Replace user configuration on startup"
-msgstr "Remplacer la configuration de l’utilisateur au démarrage"
+msgstr "Remplacer la configuration au démarrage"
 
 #: admin/applications/class_applicationGeneric.inc:86
 msgid "Replace the user configuration on startup"
@@ -217,9 +217,9 @@ msgstr "Applications autorisées pour ce rôle"
 
 #: admin/roles/class_applicationRights.inc:45
 msgid "Application list"
-msgstr "List d’applications"
+msgstr "Liste d’applications"
 
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-"Les applications que les utilisateurs avec ce rôle sont autorisés à exécuter"
+"Les applications que les utilisateurs avec ce rôle sont autorisés à lancer"
diff --git a/applications/locale/hu_HU/fusiondirectory.po b/applications/locale/hu_HU/fusiondirectory.po
index 9c176c810f8319995617a42967446f8c1f77af35..db84784546962828c187f6ae34e010f07b39a202 100644
--- a/applications/locale/hu_HU/fusiondirectory.po
+++ b/applications/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/applications/locale/id/fusiondirectory.po b/applications/locale/id/fusiondirectory.po
index 08899920f889f04ac0d9e577a29e34ba72923087..93857a568b7122614c7e99298ea6c8cf354b6240 100644
--- a/applications/locale/id/fusiondirectory.po
+++ b/applications/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/it_IT/fusiondirectory.po b/applications/locale/it_IT/fusiondirectory.po
index d62be85d29dfce25d4c691a56ab82c67fec8d4aa..3f70cac4bc9f5188c30b16cf3e51c7c3350f91ac 100644
--- a/applications/locale/it_IT/fusiondirectory.po
+++ b/applications/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/applications/locale/lv/fusiondirectory.po b/applications/locale/lv/fusiondirectory.po
index e51e4c3465fde5a943f6599c3f76e26db937a1a1..78b37d510cd3ab888621cef94d164494f17b2a28 100644
--- a/applications/locale/lv/fusiondirectory.po
+++ b/applications/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/applications/locale/nb/fusiondirectory.po b/applications/locale/nb/fusiondirectory.po
index 3072c020c94db3d8f68e63e1a278c4d7d0e98010..8150d54c7e97d0dcb4933c2351b5e69d2e678cfa 100644
--- a/applications/locale/nb/fusiondirectory.po
+++ b/applications/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/applications/locale/nl/fusiondirectory.po b/applications/locale/nl/fusiondirectory.po
index 361540bd9862c1b544ca1bd04ebdab459b776ac0..649986f9986f24095d13980259bc2b1bdc09e9d5 100644
--- a/applications/locale/nl/fusiondirectory.po
+++ b/applications/locale/nl/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Sven Mazet <sven.mazet@digipolis.be>, 2016\n"
+"Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr "Applicatie RDN"
 
 #: config/applications/class_applicationsPluginConfig.inc:43
 msgid "Branch in which applications will be stored"
-msgstr ""
+msgstr "Afdeling waarin applicaties zullen worden ogeslagen"
 
 #: config/applications/class_applicationsPluginConfig.inc:48
 msgid "Web applications RDN"
@@ -44,7 +44,7 @@ msgstr "Web applicaties RDN"
 
 #: config/applications/class_applicationsPluginConfig.inc:48
 msgid "Branch in which web applications will be stored"
-msgstr ""
+msgstr "Afdeling waarin web applicaties zullen worden opgeslagen"
 
 #: config/applications/class_applicationsPluginConfig.inc:53
 msgid "Show web applications in menu"
@@ -52,7 +52,7 @@ msgstr "Toon web applicaties in de menu"
 
 #: config/applications/class_applicationsPluginConfig.inc:53
 msgid "Whether to show web applications in FD main menu"
-msgstr ""
+msgstr "Toon webapplicaties in FD hoofdmenu"
 
 #: config/applications/class_applicationsPluginConfig.inc:56
 msgid "None"
@@ -164,7 +164,7 @@ msgstr "Plaats programma in het startmenu van groepsleden"
 #: admin/applications/class_applicationGeneric.inc:96
 #: admin/applications/class_applicationGeneric.inc:101
 msgid "Put an entry in the startup menu"
-msgstr ""
+msgstr "Geef een waarde in bij het startmenu"
 
 #: admin/applications/class_applicationGeneric.inc:101
 msgid "Place entry in members launch bar"
@@ -177,7 +177,7 @@ msgstr "Web applicatie"
 
 #: admin/applications/class_webApplication.inc:29
 msgid "Web applicationts names, icons and links"
-msgstr ""
+msgstr "Web applicatie namen, iconen en links"
 
 #: admin/applications/class_webApplication.inc:49
 msgid "Name"
@@ -197,11 +197,11 @@ msgstr "Link naar deze applicatie"
 
 #: admin/applications/class_webApplication.inc:61
 msgid "Display Name"
-msgstr ""
+msgstr "Geef naam weer"
 
 #: admin/applications/class_webApplication.inc:61
 msgid "Displayed name for links to this application"
-msgstr ""
+msgstr "Naam voor links naar deze applicatie"
 
 #: admin/applications/class_webApplication.inc:75
 msgid "Icon location"
diff --git a/applications/locale/pl/fusiondirectory.po b/applications/locale/pl/fusiondirectory.po
index fc12114d709bbb33bdee9cdd84145bb05fe76cd4..6543b43f6d574587bad8281d72b6643d2b6bfe0b 100644
--- a/applications/locale/pl/fusiondirectory.po
+++ b/applications/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/applications/class_applicationsPluginConfig.inc:28
 #: config/applications/class_applicationsPluginConfig.inc:40
diff --git a/applications/locale/pt/fusiondirectory.po b/applications/locale/pt/fusiondirectory.po
index ac298865d988bc3160f4539bcad5ecffc52d8cf7..dbcb71d48cf0f332be57a377e0195d3df84c0eb5 100644
--- a/applications/locale/pt/fusiondirectory.po
+++ b/applications/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/applications/locale/pt_BR/fusiondirectory.po b/applications/locale/pt_BR/fusiondirectory.po
index f4dc12e8ac953d54cd0397917824f89aa063f2fa..a89ab76dbf5a012594e4f71e64766074a1584dff 100644
--- a/applications/locale/pt_BR/fusiondirectory.po
+++ b/applications/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/applications/locale/ru/fusiondirectory.po b/applications/locale/ru/fusiondirectory.po
index cb3d0ed9bc376e3c120f3b6fa04dea4e7a1577e1..2973ac73665c18f9ee205df4353f338bea5c7b08 100644
--- a/applications/locale/ru/fusiondirectory.po
+++ b/applications/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/applications/locale/ru@petr1708/fusiondirectory.po b/applications/locale/ru@petr1708/fusiondirectory.po
index 37a2c764f12666b92cbe63da3ba6a59f53240b61..316f63cb35c8898fbe7c3f0dbbb2f8c97dd605b1 100644
--- a/applications/locale/ru@petr1708/fusiondirectory.po
+++ b/applications/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/sv/fusiondirectory.po b/applications/locale/sv/fusiondirectory.po
index 23e11e59d7aa777f0c05daa535b3934d89ade0b5..28f9300aa7bf3098d566c23de6f76089882ae20e 100644
--- a/applications/locale/sv/fusiondirectory.po
+++ b/applications/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/applications/locale/ug/fusiondirectory.po b/applications/locale/ug/fusiondirectory.po
index 804ae8fe11870e9865b8244bc818887faf0cc1ad..4f537f4f1f9c44d1b25aa2e5ad498c0f671938b6 100644
--- a/applications/locale/ug/fusiondirectory.po
+++ b/applications/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/vi_VN/fusiondirectory.po b/applications/locale/vi_VN/fusiondirectory.po
index 70d13bbd52b52c7bd035cfc914d63b6061b68ee2..fe6668db2dc1d827a39a206a6f49343abc3c79f0 100644
--- a/applications/locale/vi_VN/fusiondirectory.po
+++ b/applications/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/applications/locale/zh/fusiondirectory.po b/applications/locale/zh/fusiondirectory.po
index ceec226cc0d5097aed360b794fb86d5730f2549e..63132c0350da16f057f41541c0fbea7fdf570982 100644
--- a/applications/locale/zh/fusiondirectory.po
+++ b/applications/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/argonaut/addons/argonaut/class_argonautAction.inc b/argonaut/addons/argonaut/class_argonautAction.inc
index 92c14883576c50ba62a26fd7f998c9946309ecef..ea15ab0620873c9c8d5915bf719377679a377551 100644
--- a/argonaut/addons/argonaut/class_argonautAction.inc
+++ b/argonaut/addons/argonaut/class_argonautAction.inc
@@ -39,7 +39,7 @@ class TimeHisAttribute extends CompositeAttribute
         0, 59, 0
       )
     );
-    parent::__construct($description, $ldapName, $attributes, '/^(\d\d)(\d\d)(\d\d)$/', '%2d%2d%2d', $acl, $label);
+    parent::__construct($description, $ldapName, $attributes, '/^(\d\d)(\d\d)(\d\d)$/', '%02d%02d%02d', $acl, $label);
     $this->setLinearRendering(TRUE);
   }
 }
@@ -145,7 +145,7 @@ class argonautAction extends simplePlugin
     );
   }
 
-  public function __construct($action)
+  public function __construct($action, array $targets)
   {
     global $config;
     parent::__construct($config->current['BASE']);
@@ -172,7 +172,8 @@ class argonautAction extends simplePlugin
 
     $this->datetime = date('YmdHis');
 
-    $this->action = $action;
+    $this->action   = $action;
+    $this->targets  = $targets;
   }
 
   protected function loadAttributes()
@@ -212,7 +213,11 @@ class argonautAction extends simplePlugin
     timezone::get_default_timezone();
     $ret = array('args' => array());
     if ($this->scheduled) {
-      $ret['timestamp'] = strtotime($this->datetime);
+      $timestamp = strtotime($this->datetime);
+      if ($timestamp === FALSE) {
+        throw new FusionDirectoryException('Could not convert date to timestamp: "'.$this->datetime.'"');
+      }
+      $ret['timestamp'] = $timestamp;
       if ($this->periodical) {
         $ret['periodic'] = $this->period;
       }
diff --git a/argonaut/addons/argonaut/class_argonautQueue.inc b/argonaut/addons/argonaut/class_argonautQueue.inc
index e32418fe06bda10a9aa8f785f877dd4581c2af16..9a1e4483bba6d061d3dbefc79f91dcecbe7ddb93 100644
--- a/argonaut/addons/argonaut/class_argonautQueue.inc
+++ b/argonaut/addons/argonaut/class_argonautQueue.inc
@@ -96,7 +96,7 @@ class argonautQueue extends simpleManagement
     $disallowed = array();
     $this->dns  = array();
 
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, 'Entry removal requested!');
+    @DEBUG (DEBUG_SI, __LINE__, __FUNCTION__, __FILE__, $target, 'Entry removal requested!');
 
     // Check permissons for each target
     foreach ($target as $dn) {
@@ -202,7 +202,7 @@ class argonautQueue extends simpleManagement
       $entry        = $this->getHeadpage()->getEntry($target[0]);
       $attrsWrapper = new stdClass();
       $attrsWrapper->attrs = $entry['EVENT'];
-      $this->dialogObject = new faiLogView(NULL, '', $attrsWrapper, $this);
+      $this->dialogObject = new faiLogView('', $attrsWrapper, $this);
     }
   }
 
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc b/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
index 549a47aa547b31ec386c7b9cf144a1ab8a08c0f3..d472b6f8926e4c3685a2773f9d2d4fc5b48fcdb9 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2017 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -41,6 +41,10 @@ class argonautDNSConfig extends simpleService
    */
   static function getAttributesInfo ()
   {
+    $zoneAttributeClass = 'StringAttribute';
+    if (class_available('ZoneNameAttribute')) {
+      $zoneAttributeClass = 'ZoneNameAttribute';
+    }
     return array (
       'main' => array (
         'name'  => _('Ldap2zone global settings'),
@@ -113,7 +117,7 @@ class argonautDNSConfig extends simpleService
               _('Manage DNS Slaves'),
               'argonautLdap2zoneSlaveZones',
               array(
-                new StringAttribute(
+                new $zoneAttributeClass(
                   _('zone'), _('DNS zone this server should be declared as slave of'),
                   'Ldap2zoneSlaveZone', TRUE
                 ),
diff --git a/argonaut/include/class_supportDaemon.inc b/argonaut/include/class_supportDaemon.inc
index 24585cab4a40ad940631ead0588a906fe4439898..ffc807e92fbb346929a41454d9c5e2151d1a3741 100644
--- a/argonaut/include/class_supportDaemon.inc
+++ b/argonaut/include/class_supportDaemon.inc
@@ -166,7 +166,7 @@ class supportDaemon
 
   private function new_state($state_value)
   {
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->s_error, date("H.i.s")." Setting state ($state_value) to ");
+    @DEBUG (DEBUG_SI, __LINE__, __FUNCTION__, __FILE__, $this->s_error, date('H.i.s').' Setting state ('.$state_value.') to ');
     session::global_set('argonaut_state', array(
       'date'  => time(),
       'error' => $this->s_error,
@@ -185,11 +185,17 @@ class supportDaemon
   public function append($event)
   {
     if (!($event instanceof argonautAction)) {
-      return FALSE;
+      $this->set_error('Event object passed to append was not of the expected argonautAction type');
+      return $this->new_state(FALSE);
     }
 
-    /* Append an entry */
-    return $this->append_call($event->action, $event->targets, $event->computeData());
+    try {
+      /* Append an entry */
+      return $this->append_call($event->action, array_values($event->targets), $event->computeData());
+    } catch (FusionDirectoryException $e) {
+      $this->set_error($e->getMessage());
+      return $this->new_state(FALSE);
+    }
   }
 
   /*!
@@ -205,8 +211,8 @@ class supportDaemon
    */
   public function append_call($action, $targets, $data)
   {
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $action, date("H.i.s")." Appending call to");
-    if ($this->s_host == "") {
+    @DEBUG (DEBUG_SI, __LINE__, __FUNCTION__, __FILE__, array('action' => $action, 'targets' => $targets, 'data' => $data), date('H.i.s').' Appending call to');
+    if ($this->s_host == '') {
       $this->set_error($this->host_error);
       return FALSE;
     }
@@ -218,6 +224,7 @@ class supportDaemon
     try {
       $client = new jsonRPCClient($this->s_host, $this->http_options, $this->ssl_options);
       $status = $client->action($action, $targets, $data);
+      @DEBUG (DEBUG_SI, __LINE__, __FUNCTION__, __FILE__, $status, date('H.i.s').' Answer');
       $this->reset_error();
       $this->new_state(TRUE);
       return $status[0];
@@ -239,6 +246,7 @@ class supportDaemon
    */
   private function set_error($str)
   {
+    @DEBUG (DEBUG_SI, __LINE__, __FUNCTION__, __FILE__, $str, date('H.i.s').' Setting error to');
     $this->b_error = TRUE;
     $this->s_error = $str;
   }
diff --git a/argonaut/locale/ar/fusiondirectory.po b/argonaut/locale/ar/fusiondirectory.po
index bdce16d8f833e69241afcf41ed5adf5e28da657b..0c22fa6b179de9315baa75ef7a74759f61a71e06 100644
--- a/argonaut/locale/ar/fusiondirectory.po
+++ b/argonaut/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/ca/fusiondirectory.po b/argonaut/locale/ca/fusiondirectory.po
index e4607a66629bdae3d7917e1371ca78a70b741382..9653bbb5fc68b76638ce46a97ae32a0fd7ba5686 100644
--- a/argonaut/locale/ca/fusiondirectory.po
+++ b/argonaut/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/cs_CZ/fusiondirectory.po b/argonaut/locale/cs_CZ/fusiondirectory.po
index de81a9bd51baf130d01c92182227e6badeef05be..e8c09fbea942edd9bf557e20f4fbd9de685c8660 100644
--- a/argonaut/locale/cs_CZ/fusiondirectory.po
+++ b/argonaut/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -26,12 +26,12 @@ msgstr "Nalezeno více argonaut serverů. Použit je možné ale pouze jeden"
 msgid "There is no argonaut server configured"
 msgstr "Není nastaven žádný argonaut server"
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Nelze načíst %s!"
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "%s není soubor!"
@@ -476,131 +476,131 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr "nastavení DNS pro Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr "připojovací složka"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr "Složka, ve které je třeba vytvořit soubor s nastaveními"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr "Složka pro mezipaměť spojení"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr "Složka, ve které je třeba vytvořit soubory s údaji zón"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr "Životnost (TTL)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr "cesta k rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr "umístění spustitelného souboru rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr "Nebrat v potaz reverzní zónu"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr "Nezapisovat do reverzní zóny"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 "povolena aktualizace (položky je třeba oddělovat a celý seznam zakončit "
 "středníkem – „;“ )"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 "povolen přenos (položky je třeba oddělovat a celý seznam zakončit středníkem"
 " – „;“ )"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/de/fusiondirectory.po b/argonaut/locale/de/fusiondirectory.po
index 2b57eaaa404626ba386bea71577e4315b11de1ad..613cbc7a4310874a097d000ca34f835871cc8317 100644
--- a/argonaut/locale/de/fusiondirectory.po
+++ b/argonaut/locale/de/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: d.oertel <d.oertel@uib.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,12 +26,12 @@ msgstr "Mehrere argonaut Server gefunden. Nur einer wird unterstützt"
 msgid "There is no argonaut server configured"
 msgstr "Es ist kein argonaut-Server konfiguriert"
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "\"%s\" konnte nicht gelesen werden!"
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" ist keine Datei!"
@@ -129,7 +129,7 @@ msgstr "(Re)Installieren"
 
 #: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
-msgstr ""
+msgstr "Refresh der Slave Dateien (ldap2zone)"
 
 #: addons/argonaut/class_argonautAction.inc:27
 #: addons/argonaut/class_argonautAction.inc:126
@@ -156,11 +156,11 @@ msgstr "Zeit"
 #: addons/argonaut/class_argonautAction.inc:81
 #: addons/argonaut/class_argonautAction.inc:84
 msgid "Argonaut task"
-msgstr ""
+msgstr "Argonaut task"
 
 #: addons/argonaut/class_argonautAction.inc:82
 msgid "Schedule an argonaut task"
-msgstr ""
+msgstr "Argonaut task planen"
 
 #: addons/argonaut/class_argonautAction.inc:97
 #: addons/argonaut/class_argonautAction.inc:107
@@ -174,11 +174,11 @@ msgstr "Periodischer Auftrag"
 
 #: addons/argonaut/class_argonautAction.inc:111
 msgid "Wether this job should repeat in time"
-msgstr ""
+msgstr "Soll dieser Auftrag wiederholt werden ?"
 
 #: addons/argonaut/class_argonautAction.inc:115
 msgid "How often this task should be repeated"
-msgstr ""
+msgstr "Wie oft soll dieser Auftrag wiederholt werden ?"
 
 #: addons/argonaut/class_argonautAction.inc:126
 msgid "Days"
@@ -203,7 +203,7 @@ msgstr "Ziele"
 
 #: addons/argonaut/class_argonautAction.inc:140
 msgid "Targets for this task"
-msgstr ""
+msgstr "Ziele für diesen Task"
 
 #: addons/argonaut/deploy-list.xml:10
 msgid "List of queued jobs"
@@ -258,11 +258,11 @@ msgstr "Protokolle einsehen"
 #: addons/argonaut/class_argonautImportFile.inc:33
 #: addons/argonaut/class_argonautImportFile.inc:36
 msgid "Argonaut task import"
-msgstr ""
+msgstr "Argonaut Task Import"
 
 #: addons/argonaut/class_argonautImportFile.inc:34
 msgid "Imports argonaut tasks from CSV file"
-msgstr ""
+msgstr "Importiert Argonaut Taks aus einer CSV Datei"
 
 #: addons/argonaut/class_argonautImportFile.inc:49
 msgid "Import actions from CSV file"
@@ -270,7 +270,7 @@ msgstr "Aktionen aus CSV-Datei importieren"
 
 #: addons/argonaut/class_argonautImportFile.inc:53
 msgid "Import a list of task into argonaut"
-msgstr ""
+msgstr "Importiert eine Liste von Taks in Argonaut"
 
 #: addons/argonaut/class_argonautImportFile.inc:63
 msgid "Upload"
@@ -286,7 +286,7 @@ msgstr "Importierte Aufgaben"
 
 #: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
-msgstr ""
+msgstr "Biite beheben Sie zunächst die Fehler in Ihrer CSV Datei"
 
 #: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
@@ -474,129 +474,131 @@ msgstr "NFS root"
 msgid "Argonaut DNS settings"
 msgstr "Argonaut DNS Einstellungen"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
-msgstr ""
+msgstr "Ldap2zone Globale Einstellungen"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr "Bind Verzeichnis"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr "Das Verzeichnis in dem conf-Datei erstellt werden muss"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr "Bind cache Verzeichnis"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr "Das Verzeichnis in welchem Zonendateien erstellt werden müssen"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr "Time to Live"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr "rndc Pfad"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr "Pfad zu rndc-Binary"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
-msgstr ""
+msgstr "Search Base"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
+"LDAP base in dem ldap2zone suchen soll. Nur dann sinnvoll, wenn verschiedene"
+" Knoten für die selbe Zone vorhanden sind."
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
-msgstr ""
+msgstr "Ldap2zone Haupeinstellungen"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
-msgstr ""
+msgstr "Reverse Zone ignorieren"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
-msgstr ""
+msgstr "Reverse Zone nicht schreiben"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
-msgstr ""
+msgstr "Melden"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
-msgstr ""
+msgstr "Update erlauben"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Aktualisierung erlauben (Semikolon getrennt und beendet)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
-msgstr ""
+msgstr "Transfer erlauben"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Transfer erlauben  (Semikolon getrennt und beendet)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
-msgstr ""
+msgstr "Überprüfe Namen"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
-msgstr ""
+msgstr "Ldap2zone Slave Einstellungen"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
-msgstr ""
+msgstr "Verwalte DNS Slaves"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
-msgstr ""
+msgstr "Zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
-msgstr ""
+msgstr "Die DNS Zone dieses Servers soll festgelegt werden als Slave von"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
-msgstr ""
+msgstr "Master"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
-msgstr ""
+msgstr "Master IP(s) für diese Zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
-msgstr ""
+msgstr "Der Server soll auch Slave der Reverszonen sien"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
-msgstr ""
+msgstr "DNS Slave"
 
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
@@ -765,6 +767,8 @@ msgstr "Proxy"
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
 msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
+"Gibt den http Proxy (wie z.B. Squid) an welcher für die http und hftp "
+"Methoden verwendet werden soll"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
 msgid "Directory in which logs should be stored"
@@ -779,6 +783,8 @@ msgid ""
 "Causes debmirror to ignore missing or broken deb and source files but still "
 "be pedantic about checking meta files"
 msgstr ""
+"Veranlasst den DebMirror fehlende oder kaputte deb- oder source-Pakete zu "
+"ignorieren aber meta Dateien weiterhin genau zu prüfen."
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
 msgid "Source"
@@ -794,7 +800,7 @@ msgstr "GPG Check"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
 msgid "Fail if the Release.gpg file is missing"
-msgstr ""
+msgstr "Abbrechen wenn die Release.gpg Datei fehlt."
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
 msgid "Contents"
@@ -805,6 +811,8 @@ msgid ""
 "Additionally download Contents.<arch>.gz files (Note that these files can be"
 " relatively big and can change frequently)"
 msgstr ""
+"Zusätzlich Contents.<arch>.gz Dateien herunterladen. (Beachten Sie, dass "
+"diese Dateien vergleichsweise groß sein können und sich häufig ändern.)"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "Verbose"
@@ -841,7 +849,7 @@ msgstr "Objektgruppe"
 
 #: addons/argonaut/import_events.tpl.c:17
 msgid "Available job types: %1"
-msgstr ""
+msgstr "Verfügbare Job-Typen: %1"
 
 #: addons/argonaut/import_events.tpl.c:20
 msgid "Timestamp"
diff --git a/argonaut/locale/el_GR/fusiondirectory.po b/argonaut/locale/el_GR/fusiondirectory.po
index 295b1119cd0f9fd2ec1a9cf03097e2db30204d59..f0d8d8e74ee4db4314e471ad1917129cac93f238 100644
--- a/argonaut/locale/el_GR/fusiondirectory.po
+++ b/argonaut/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Αδύνατη η ανάγνωση του \"%s\"!"
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "Το \"%s\" δεν είναι αρχείο!"
@@ -476,128 +476,128 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr "Ρυθμίσεις του Argonaut DNS"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr "O κατάλογος στον οποίο το αρχείο conf πρέπει να δημιουργηθεί"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 "Ο κατάλογος στον οποίο πρέπει να δημιουργηθούν τα αρχεία ζώνης (zone files)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr "Χρόνος ζωής"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/en/fusiondirectory.po b/argonaut/locale/en/fusiondirectory.po
index 6ddcd128551a02aa242f51853ca2283dac337473..f3963760eaf119baf34563ed346aeabd2bfb21eb 100644
--- a/argonaut/locale/en/fusiondirectory.po
+++ b/argonaut/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -469,127 +469,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/es/fusiondirectory.po b/argonaut/locale/es/fusiondirectory.po
index be94abb90273fd2ed0a455f61cf2185bc523451b..e4596e300b2a6c159c6ac0400de09b896bd8ebf7 100644
--- a/argonaut/locale/es/fusiondirectory.po
+++ b/argonaut/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -471,127 +471,127 @@ msgstr "Raiz NFS"
 msgid "Argonaut DNS settings"
 msgstr "Opciones de DNS de Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr "Directorio de Bind"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr "ruta de rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Permitir actualización (separado y terminado con punto y coma)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Permitir transferencia (separado y terminado con punto y coma)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/es_CO/fusiondirectory.po b/argonaut/locale/es_CO/fusiondirectory.po
index 213f447e9a0d27cbcf64fdc212c972f8005cad4e..6b6dec4d094c6266cf3a16418ba1f851207ffa86 100644
--- a/argonaut/locale/es_CO/fusiondirectory.po
+++ b/argonaut/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/es_VE/fusiondirectory.po b/argonaut/locale/es_VE/fusiondirectory.po
index bf3dc212ccde2ff4dfc26dc07bd834cfc68d96d1..fea2e0ec6268cfa35c07f5c41c37fe306c7b9533 100644
--- a/argonaut/locale/es_VE/fusiondirectory.po
+++ b/argonaut/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -26,12 +26,12 @@ msgstr "Varios servidores Argonaut encontrados. Solo se soporta uno"
 msgid "There is no argonaut server configured"
 msgstr "No hay un servidor Argonaut configurado"
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -471,127 +471,127 @@ msgstr "Raiz NFS"
 msgid "Argonaut DNS settings"
 msgstr "Opciones de DNS de Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr "Directorio de Bind"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr "ruta de rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Permitir actualización (separado y terminado con punto y coma)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Permitir transferencia (separado y terminado con punto y coma)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/fa_IR/fusiondirectory.po b/argonaut/locale/fa_IR/fusiondirectory.po
index 090d93dc4749bbd8ea714cfccbd548ce845a10bd..7952d7855e94e74d0b5dde2c73aceb1c55d65a62 100644
--- a/argonaut/locale/fa_IR/fusiondirectory.po
+++ b/argonaut/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/fi_FI/fusiondirectory.po b/argonaut/locale/fi_FI/fusiondirectory.po
index a88ea37f6cf7d9acbb67dc17d9f8e2405d43acd9..ffefd55bd680e580a307de984bcca784ce2b1fb6 100644
--- a/argonaut/locale/fi_FI/fusiondirectory.po
+++ b/argonaut/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/fr/fusiondirectory.po b/argonaut/locale/fr/fusiondirectory.po
index 54ec420a3e218cdf895b1044845261e2fde26c24..8ce003f9bcc18f09784227e4208745b6954c86bf 100644
--- a/argonaut/locale/fr/fusiondirectory.po
+++ b/argonaut/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,12 +28,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr "Il n'y a pas de serveur Argonaut configuré"
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Impossible de lire \"%s\" !"
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" n'est pas un fichier !"
@@ -158,11 +158,11 @@ msgstr "Temps"
 #: addons/argonaut/class_argonautAction.inc:81
 #: addons/argonaut/class_argonautAction.inc:84
 msgid "Argonaut task"
-msgstr "Tache argonaut"
+msgstr "Tache Argonaut"
 
 #: addons/argonaut/class_argonautAction.inc:82
 msgid "Schedule an argonaut task"
-msgstr "Planifier une tâche argonaut"
+msgstr "Planifier une tâche Argonaut"
 
 #: addons/argonaut/class_argonautAction.inc:97
 #: addons/argonaut/class_argonautAction.inc:107
@@ -176,11 +176,11 @@ msgstr "Tâche périodique"
 
 #: addons/argonaut/class_argonautAction.inc:111
 msgid "Wether this job should repeat in time"
-msgstr "Est ce que cette tache doit être récurrente"
+msgstr "Est-ce que cette tache doit se répéter dans le temps"
 
 #: addons/argonaut/class_argonautAction.inc:115
 msgid "How often this task should be repeated"
-msgstr "Combien de fois doit être répété cette tache"
+msgstr "Avec quel fréquence doit être répété cette tache"
 
 #: addons/argonaut/class_argonautAction.inc:126
 msgid "Days"
@@ -197,7 +197,7 @@ msgstr "Mois"
 #: addons/argonaut/class_argonautAction.inc:132
 #: addons/argonaut/deploy-list.xml:43
 msgid "Period"
-msgstr "Période"
+msgstr "Fréquence"
 
 #: addons/argonaut/class_argonautAction.inc:137
 msgid "Targets"
@@ -209,7 +209,7 @@ msgstr "Cibles pour cette tache"
 
 #: addons/argonaut/deploy-list.xml:10
 msgid "List of queued jobs"
-msgstr "Liste des tâches dans la queue"
+msgstr "Liste des tâches dans la file"
 
 #: addons/argonaut/deploy-list.xml:14
 #: addons/argonaut/class_argonautImportFile.inc:185
@@ -223,7 +223,7 @@ msgstr "Cible"
 
 #: addons/argonaut/deploy-list.xml:35
 msgid "Task"
-msgstr "Tâches"
+msgstr "Tache"
 
 #: addons/argonaut/deploy-list.xml:59
 msgid "Status"
@@ -260,23 +260,23 @@ msgstr "Voir les journaux systèmes"
 #: addons/argonaut/class_argonautImportFile.inc:33
 #: addons/argonaut/class_argonautImportFile.inc:36
 msgid "Argonaut task import"
-msgstr "Importation des taches argonaut"
+msgstr "Import de taches Argonaut"
 
 #: addons/argonaut/class_argonautImportFile.inc:34
 msgid "Imports argonaut tasks from CSV file"
-msgstr "Importer taches argonaut depuis un fichier CSV"
+msgstr "Importer des taches Argonaut depuis un fichier CSV"
 
 #: addons/argonaut/class_argonautImportFile.inc:49
 msgid "Import actions from CSV file"
-msgstr "Importer les actions depuis un fichier CSV"
+msgstr "Importer des actions depuis un fichier CSV"
 
 #: addons/argonaut/class_argonautImportFile.inc:53
 msgid "Import a list of task into argonaut"
-msgstr "Importer une liste de taches dans argonaut"
+msgstr "Importer une liste de taches dans Argonaut"
 
 #: addons/argonaut/class_argonautImportFile.inc:63
 msgid "Upload"
-msgstr "Télécharger"
+msgstr "Téléverser"
 
 #: addons/argonaut/class_argonautImportFile.inc:67
 msgid "Import file"
@@ -284,11 +284,11 @@ msgstr "Importer un fichier"
 
 #: addons/argonaut/class_argonautImportFile.inc:72
 msgid "Imported tasks"
-msgstr "Taches importées "
+msgstr "Taches importées"
 
 #: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
-msgstr "Fixer les erreurs dans votre CSV"
+msgstr "Corrigez les erreurs dans votre fichier CSV d’abord"
 
 #: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
@@ -302,7 +302,7 @@ msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
-msgstr "le fichier est vide."
+msgstr "le fichier est vide"
 
 #: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
@@ -312,7 +312,7 @@ msgstr "MAC"
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #, php-format
 msgid "Cannot load queue entries: %s"
-msgstr "Impossible de charger les entrées de la queue : %s"
+msgstr "Impossible de charger les entrées de la file : %s"
 
 #: admin/systems/argonaut/class_argonautClient.inc:117
 msgid "Argonaut client"
@@ -350,15 +350,17 @@ msgstr "Interface WakeOnLan"
 
 #: admin/systems/argonaut/class_argonautClient.inc:144
 msgid "Interface used by argonaut for WakeOnLan"
-msgstr "Interface utilisée par argonaut pour le WakeOnLan :"
+msgstr "Interface utilisée par Argonaut pour le WakeOnLan"
 
 #: admin/systems/argonaut/class_argonautClient.inc:149
 msgid "TaskId file"
-msgstr "Fichier des id de tâches"
+msgstr "Fichier d’id"
 
 #: admin/systems/argonaut/class_argonautClient.inc:149
 msgid "File which argonaut will use to store its task id when booting"
-msgstr "Fichier qu'Argonaut utilise pour stocker les tâches au démarrage"
+msgstr ""
+"Fichier qu'Argonaut utilise pour stocker son identifiant de processus au "
+"démarrage"
 
 #: admin/systems/argonaut/class_argonautClient.inc:154
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
@@ -369,7 +371,7 @@ msgstr "Répertoire des journaux systèmes"
 
 #: admin/systems/argonaut/class_argonautClient.inc:154
 msgid "Directory in which argonaut client should write its logs"
-msgstr "Dossier des journaux systèmes du client Argonaut"
+msgstr "Dossier dans lequel le client Argonaut stock ses journaux systèmes"
 
 #: admin/systems/argonaut/class_argonautClient.inc:161
 #: admin/systems/services/argonaut/class_argonautServer.inc:103
@@ -379,7 +381,7 @@ msgstr "Chemins SSL"
 #: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
 msgid "Key"
-msgstr "Clef"
+msgstr "Clé"
 
 #: admin/systems/argonaut/class_argonautClient.inc:164
 msgid "Path to the private key file on Argonaut client"
@@ -412,7 +414,7 @@ msgstr "CN du certificat"
 
 #: admin/systems/argonaut/class_argonautClient.inc:179
 msgid "The CN in this client certificate"
-msgstr "Le CN dans le certificat client"
+msgstr "Le CN utilisé dans le certificat client"
 
 #: admin/systems/argonaut/class_argonautClient.inc:185
 msgid "Service names"
@@ -420,7 +422,7 @@ msgstr "Nom des services"
 
 #: admin/systems/argonaut/class_argonautClient.inc:187
 msgid "Argonaut service names"
-msgstr "Noms de services pour Argonaut"
+msgstr "Noms des services pour Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -433,7 +435,7 @@ msgstr "Paramètres de Argonaut Fuse pour le module OPSI"
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 msgid "Services"
-msgstr "Service"
+msgstr "Services"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
@@ -470,100 +472,100 @@ msgstr "Paramètres FAI"
 
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
 msgid "NFS root"
-msgstr "racine NFS"
+msgstr "Racine NFS"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
 msgstr "Paramètres DNS de Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr "Paramètres globaux Ldap2zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr "Répertoire Bind"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr "Le répertoire dans lequel le fichier de configuration doit être créé"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr "Répertoire de cache de Bind"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr "Le répertoire dans lequel les fichiers de zones doivent être créés"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr "Temps de vie"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr "Binaire rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr "Chemin vers le binaire rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr "Base de recherche"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
-"Base LDAP dans laquelle ldap2zone  doit effectuer la recherche. Seulement "
+"Base LDAP dans laquelle ldap2zone doit effectuer la recherche. Seulement "
 "utile si vous avez plusieurs nœuds pour la même zone."
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
-msgstr "Paramètres DNS maîtres Ldap2zone"
+msgstr "Paramètres DNS maître Ldap2zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr "Ignorer la zone inverse"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr "Ne pas écrire la zone inverse"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr "Notifier"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
-msgstr "Permet les updates"
+msgstr "Permettre les updates"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 "IPs autorisées à mettre à jour (séparées et terminé par un point-virgule)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
-msgstr "Permet le transfert"
+msgstr "Permettre le transfert"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 "IPs autorisées à transférer (séparées et terminé par un point-virgule)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr "Vérifier les noms"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
@@ -571,41 +573,41 @@ msgstr ""
 "Force la vérification avec les RFC 952 et RFC 1123 de tout nom d'hôte pour "
 "la zone, le niveau de vérification est en fonction du paramètre choisi"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
-msgstr "Paramètres DNS esclaves Ldap2zone"
+msgstr "Paramètres DNS esclave Ldap2zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
-msgstr "Gerer les DNS slaves"
+msgstr "Gérer les DNS esclaves"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr "zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
-msgstr "Zone(s) DNS qui doivent être stockées comme esclave sur ce serveur"
+msgstr "Zones DNS dont ce serveur doit être déclaré comme esclave"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
-msgstr "Maître"
+msgstr "maître"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
-msgstr "IP principale (s) pour cette zone"
+msgstr "IP(s) maitre(s) pour cette zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
-msgstr "Zones inverses"
+msgstr "inverses"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr "Ce serveur doit aussi être esclave des zones inverses"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
-msgstr "DNS slaves"
+msgstr "Esclaves DNS"
 
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
@@ -638,7 +640,7 @@ msgstr "Mode par défaut"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
 msgid "Directory in which argonaut-fuse will store its log"
-msgstr "Dossier des jounaux systèmes de argonaut-fuse"
+msgstr "Répertoire dans lequel argonaut-fuse stock les jounaux systèmes"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
 msgid "TFTP"
@@ -650,7 +652,7 @@ msgstr "Répertoire des fichiers pxelinux"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
-msgstr "Chemin où argonaut-fuse stockera le fichier \"pxelinux.cfg\""
+msgstr "Chemin où argonaut-fuse doit stocker le fichier pxelinux.cfg"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
@@ -679,9 +681,9 @@ msgid ""
 "repositories at start and then once a day. Needed for FAI package list "
 "creation."
 msgstr ""
-"Si oui ou non le serveur Argonaut devrait obtenir les informations des "
-"paquets à partir des dépôts au lancement, puis une fois par jour. Nécessaire"
-" pour la création de listes de paquets FAI."
+"Si le serveur Argonaut doit récupérer les informations des paquets à partir "
+"des dépôts au lancement, puis une fois par jour. Nécessaire pour la création"
+" de listes de paquets FAI."
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:66
 msgid "Port"
@@ -693,7 +695,7 @@ msgstr "Port d’écoute du serveur Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:72
 msgid "Timeout"
-msgstr "Temps d'attente maximum"
+msgstr "Délai maximum"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:73
 msgid ""
@@ -704,7 +706,7 @@ msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:80
 msgid "Directory in which argonaut will store its log"
-msgstr "Répertoire contenant les journaux systèmes d'Argonaut"
+msgstr "Répertoire dans lequel Argonaut stock ses journaux systèmes"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:87
 msgid "Wake on lan"
@@ -742,16 +744,16 @@ msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
 msgid "The CN in the server certificate"
-msgstr "Le CN dans le certificat serveur"
+msgstr "Le CN utilisé dans le certificat serveur"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
 msgid "Argonaut Mirror settings"
-msgstr "Paramètres des miroirs Argonaut"
+msgstr "Paramètres de miroir Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
 msgid "Argonaut mirror settings"
-msgstr "Paramètres des miroirs Argonaut"
+msgstr "Paramètres de miroir Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
 msgid "Local Debian mirror directory"
@@ -779,7 +781,7 @@ msgstr "Proxy"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
 msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr "Le proxy http (comme Squid) à utiliser pour les méthode http et hftp"
+msgstr "Le proxy http (comme Squid) à utiliser pour les méthodes http et hftp"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
 msgid "Directory in which logs should be stored"
@@ -803,7 +805,7 @@ msgstr "Source"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
 msgid "Include source in the mirror"
-msgstr "Inclus les sources dans le miroir"
+msgstr "Inclure les sources dans le miroir"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
 msgid "GPG Check"
@@ -860,7 +862,7 @@ msgstr "groupe d'objets"
 
 #: addons/argonaut/import_events.tpl.c:17
 msgid "Available job types: %1"
-msgstr "Type de taches disponibles: %1"
+msgstr "Type de taches disponibles : %1"
 
 #: addons/argonaut/import_events.tpl.c:20
 msgid "Timestamp"
@@ -868,4 +870,4 @@ msgstr "Date"
 
 #: addons/argonaut/import_events.tpl.c:29
 msgid "Object group"
-msgstr "Groupes d'objets"
+msgstr "Groupe d'objets"
diff --git a/argonaut/locale/hu_HU/fusiondirectory.po b/argonaut/locale/hu_HU/fusiondirectory.po
index 9fb4fb9cf5a491beeede2520d57fb82862fc5a70..dce2e6ac1c6c07772887eb9c67a422633493b38c 100644
--- a/argonaut/locale/hu_HU/fusiondirectory.po
+++ b/argonaut/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -469,127 +469,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/id/fusiondirectory.po b/argonaut/locale/id/fusiondirectory.po
index efcb05605758be08aabf624c856d3d0e0651d342..56b06aff8fc42f14fa20dfc191cb814a8d6effd7 100644
--- a/argonaut/locale/id/fusiondirectory.po
+++ b/argonaut/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -469,127 +469,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/it_IT/fusiondirectory.po b/argonaut/locale/it_IT/fusiondirectory.po
index fdc4129d8aade37db50908101c536e7f4e899bee..8c137e67f7c60a7b37e51c884a0375e385161ec3 100644
--- a/argonaut/locale/it_IT/fusiondirectory.po
+++ b/argonaut/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -26,12 +26,12 @@ msgstr "Trovati più di un server Argonaut. Solo uno è supportato"
 msgid "There is no argonaut server configured"
 msgstr "Non c'è nessun server Argonaut configurato"
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Impossibile analizzare \"%s\"!"
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" non é un file!"
@@ -472,91 +472,91 @@ msgstr "Radice NFS"
 msgid "Argonaut DNS settings"
 msgstr "Impostazioni DNS di Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr "Impostazioni globali Ldap2zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr "Cartella per Bind"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr "La cartella nella quale sarà creato il file di configurazione"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr "Directory di cache per Bind"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr "La cartella nella quale le zone DNS saranno create"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr "Durata"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr "path rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr "path verso il file binario di rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr "Base di ricerca"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr "zona DNS il cui server deve essere dichiarato come slave di"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr "Impostazioni master di Ldap2zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr "Ignorare zona inversa"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr "Non scrivere, zona inversa"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr "Notifica"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr "Consenti aggiornamento"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 "Consenti l'aggiornamento (punto e virgola per la separazione e la chiusura)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr "Consenti trasferimento"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 "Consenti il trasferimento (punto e virgola per la separazione e la chiusura)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr "Controllare i nomi"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
@@ -564,39 +564,39 @@ msgstr ""
 "Causa qualsiasi nome host per la zona da controllare per la conformità con "
 "RFC 952 e RFC 1123 e prendere l'azione definita"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr "Impostazione dello slave Ldap2zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr "Gestione di Slaves DNS"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr "Zona"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr "zona DNS il cui server deve essere dichiarato come slave di"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr "Master"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr "Master IP(s) per questa zona"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr "rovesci"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr "Questo server dovrebbe essere slave anche di zone di rovesci"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr "Slaves DNS"
 
diff --git a/argonaut/locale/lv/fusiondirectory.po b/argonaut/locale/lv/fusiondirectory.po
index a641331411c9dd3adc285274017f5b9db9c0e497..bb8dacbea33181a3c663abf998ddc9a4e8732838 100644
--- a/argonaut/locale/lv/fusiondirectory.po
+++ b/argonaut/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/nb/fusiondirectory.po b/argonaut/locale/nb/fusiondirectory.po
index 3b0f5477bc3e10b7fcab2c91dd22b1d4078c9a76..bf7c48e63d7632aaaf13ec631fe81b63ac7e906d 100644
--- a/argonaut/locale/nb/fusiondirectory.po
+++ b/argonaut/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/nl/fusiondirectory.po b/argonaut/locale/nl/fusiondirectory.po
index d498c638d266f65adc6223d38c19258b9fd2836d..44834a0fbad1475671df1a8943ae317f9caf8c6f 100644
--- a/argonaut/locale/nl/fusiondirectory.po
+++ b/argonaut/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sven Mazet <sven.mazet@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -26,12 +26,12 @@ msgstr "Meerdere argonaut servers gevonden. Er is maar 1 mogelijk"
 msgid "There is no argonaut server configured"
 msgstr " Er is geen argonaut server geconfigureerd"
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Kan \"%s\" niet lezen!"
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" is geen bestand!"
@@ -472,127 +472,127 @@ msgstr "NFS root"
 msgid "Argonaut DNS settings"
 msgstr "Argonaut DNS instellingen"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr "BIND map"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr "rdnc path"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Aanvaard update (puntkomma gescheiden en beindigd)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Aanvaard transfer (puntkomma gescheiden en beindigd)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/pl/fusiondirectory.po b/argonaut/locale/pl/fusiondirectory.po
index f48dabcf84935ec5ed6d209e31882faac05ba065..9fff47b5eacf25320195489142827498e9a2fdee 100644
--- a/argonaut/locale/pl/fusiondirectory.po
+++ b/argonaut/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: include/class_supportDaemon.inc:107
 msgid "Multiple argonaut server found. Only one is supported"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/pt/fusiondirectory.po b/argonaut/locale/pt/fusiondirectory.po
index ef6a2b09387b833414b295dd39d4c4ff4915ac37..7771a3e2acabbb57d50f093fb185cdb22043d3dd 100644
--- a/argonaut/locale/pt/fusiondirectory.po
+++ b/argonaut/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/pt_BR/fusiondirectory.po b/argonaut/locale/pt_BR/fusiondirectory.po
index 4b6cedfa98fffbf7d7671fbb9c3396837bc1c80b..2f1575a13978ebfb8878e788139720b2d5047541 100644
--- a/argonaut/locale/pt_BR/fusiondirectory.po
+++ b/argonaut/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -26,12 +26,12 @@ msgstr "Servidores múltiplos argonaut encontrados. Apenas um é suportado"
 msgid "There is no argonaut server configured"
 msgstr "Este não é um servidor argonaut configurado"
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -472,127 +472,127 @@ msgstr "Raiz NFS"
 msgid "Argonaut DNS settings"
 msgstr "Configuração DNS Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr "Diretório Bind"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr "O diretório onde o arquivo conf será criado"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr "Diretório cache do Bind"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr "Diretório onde os arquivos de zona serão criados"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr "Tempo para viver"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr "Caminho rndc"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr "Caminho para rndc binário"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Permitir atualização (separador ponto e vírgula e terminou)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Permitir Transferência (separador ponto e vírgula e terminou)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/ru/fusiondirectory.po b/argonaut/locale/ru/fusiondirectory.po
index f947d0b549210808cb629064d7b5444c3e71f7b1..571d905bc0ba2e82ba545e83c22a5dbe38089f90 100644
--- a/argonaut/locale/ru/fusiondirectory.po
+++ b/argonaut/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/ru@petr1708/fusiondirectory.po b/argonaut/locale/ru@petr1708/fusiondirectory.po
index e41f9dc81c9a880a109b176bc0ec184234b749b4..56d8a941ad53a8a9d545dee4c632582b33abc7ae 100644
--- a/argonaut/locale/ru@petr1708/fusiondirectory.po
+++ b/argonaut/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -469,127 +469,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/sv/fusiondirectory.po b/argonaut/locale/sv/fusiondirectory.po
index 4f5f29d16d002854c07f4f031bc968f2fbc94e6c..d9969b28893c38a935457312cb4766a90657402f 100644
--- a/argonaut/locale/sv/fusiondirectory.po
+++ b/argonaut/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/ug/fusiondirectory.po b/argonaut/locale/ug/fusiondirectory.po
index ae673cb7fb8361000093342c38adb3597c7d8306..2395b96b06d012d8597af6c5690470f76757b616 100644
--- a/argonaut/locale/ug/fusiondirectory.po
+++ b/argonaut/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -469,127 +469,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/vi_VN/fusiondirectory.po b/argonaut/locale/vi_VN/fusiondirectory.po
index bd34c8058e62b6f7b6f33b2c96553144c586a0b2..30f130d3e0ac959a73f25b6556e323a167b18ac0 100644
--- a/argonaut/locale/vi_VN/fusiondirectory.po
+++ b/argonaut/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/zh/fusiondirectory.po b/argonaut/locale/zh/fusiondirectory.po
index 617bb793c56677718b497becc85a154fbd5fea91..3a88474b71a0cd20a90904744da47eaddf55c1ba 100644
--- a/argonaut/locale/zh/fusiondirectory.po
+++ b/argonaut/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -26,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:608
+#: include/class_supportDaemon.inc:616
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:612
+#: include/class_supportDaemon.inc:620
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -470,127 +470,127 @@ msgstr ""
 msgid "Argonaut DNS settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
 msgid "Ldap2zone global settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "Bind directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
 msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "Bind cache directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:60
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Time to live"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:68
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
 msgid "rndc path"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:69
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
 msgid "path to rndc binary"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid "Search base"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:75
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
 msgid "Ldap2zone master settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Ignore reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:84
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
 msgid "Do not write reverse zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/audit/locale/ar/fusiondirectory.po b/audit/locale/ar/fusiondirectory.po
index b55bf327041d4a04bab197cb164eab1343723742..f7883913dfe6fea70f8d407483708f2e451987a0 100644
--- a/audit/locale/ar/fusiondirectory.po
+++ b/audit/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/audit/locale/ca/fusiondirectory.po b/audit/locale/ca/fusiondirectory.po
index 04c86f2657e67d835dc8bb5dc9fff2ca3d7f5752..41aa0193095a2a886a5153dc9bd13cd576d382de 100644
--- a/audit/locale/ca/fusiondirectory.po
+++ b/audit/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/audit/locale/cs_CZ/fusiondirectory.po b/audit/locale/cs_CZ/fusiondirectory.po
index a506c7495f9a60394e91b6b6960f16205164e23b..e68c981cf440d991a17ae07b3f4e1c9f0a73e25f 100644
--- a/audit/locale/cs_CZ/fusiondirectory.po
+++ b/audit/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/audit/locale/de/fusiondirectory.po b/audit/locale/de/fusiondirectory.po
index f292ef821de08461c2dd9173c4e4cd21b5499d96..c114d96ac83a9c0be4ed080f8d7ce650acd5471c 100644
--- a/audit/locale/de/fusiondirectory.po
+++ b/audit/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/audit/locale/el_GR/fusiondirectory.po b/audit/locale/el_GR/fusiondirectory.po
index 47dfe19488d0b2513e890f2d047a81706400a9d2..88b9c81e1bad780a87d6d9735e642adba85c9182 100644
--- a/audit/locale/el_GR/fusiondirectory.po
+++ b/audit/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/audit/locale/en/fusiondirectory.po b/audit/locale/en/fusiondirectory.po
index 1ff02683afd8209b69fede2123a9ac0503571b51..cf7bd41538b46468dc30e599556e70d7de473218 100644
--- a/audit/locale/en/fusiondirectory.po
+++ b/audit/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/audit/locale/es/fusiondirectory.po b/audit/locale/es/fusiondirectory.po
index b7c93b1ada341e9f4a4a64728ecdfd98941f4c97..0497687bd8b7782497d04be88d474942cb7e4bb8 100644
--- a/audit/locale/es/fusiondirectory.po
+++ b/audit/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/audit/locale/es_CO/fusiondirectory.po b/audit/locale/es_CO/fusiondirectory.po
index dcfe79f738f3a9788813e05a575d93e3e04173b9..5789cef69362b00a18e3e2fe444b6c10d1c273d7 100644
--- a/audit/locale/es_CO/fusiondirectory.po
+++ b/audit/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/audit/locale/es_VE/fusiondirectory.po b/audit/locale/es_VE/fusiondirectory.po
index 1a251501c0743db31c4f661ae2137cd2a19073b9..43fd8ff0997c6d6d22560ecc98bcffc18bfe5a80 100644
--- a/audit/locale/es_VE/fusiondirectory.po
+++ b/audit/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/audit/locale/fa_IR/fusiondirectory.po b/audit/locale/fa_IR/fusiondirectory.po
index 43476ab9a63a18000c62849dfae710b52de86592..cfbfb66b09e012db984ede4bc590d90f2a430a7e 100644
--- a/audit/locale/fa_IR/fusiondirectory.po
+++ b/audit/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/audit/locale/fi_FI/fusiondirectory.po b/audit/locale/fi_FI/fusiondirectory.po
index 715e90657e17feb7e2848f463226c15be918c754..0de05c75e16c3d903de653015beedc0a7bee0bca 100644
--- a/audit/locale/fi_FI/fusiondirectory.po
+++ b/audit/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/audit/locale/fr/fusiondirectory.po b/audit/locale/fr/fusiondirectory.po
index fd88370fb0528c1124cc2e85de486a7a82ed0d88..90ba8683f6cc75453209288e84e746063cfc1262 100644
--- a/audit/locale/fr/fusiondirectory.po
+++ b/audit/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,11 +33,11 @@ msgstr "Audit"
 
 #: config/audit/class_auditConfig.inc:44
 msgid "Audit RDN"
-msgstr "Audit RDN"
+msgstr "Branche audit"
 
 #: config/audit/class_auditConfig.inc:44
 msgid "Branch in which audit events will be stored"
-msgstr "Branche dans laquelle les audit sont stockés"
+msgstr "Branche dans laquelle les évènements d’audit sont stockés"
 
 #: config/audit/class_auditConfig.inc:50
 msgid "Actions to audit"
@@ -45,11 +45,11 @@ msgstr "Actions à auditer"
 
 #: config/audit/class_auditConfig.inc:50
 msgid "Which actions should be stored in LDAP audit log"
-msgstr "Quelles actions doivent être stockés dans journal d'audit"
+msgstr "Quelles actions doivent être stockées dans le journal d'audit"
 
 #: config/audit/class_auditConfig.inc:57
 msgid "Days to keep"
-msgstr "Nombre de jours a conserver"
+msgstr "Nombre de jours à conserver"
 
 #: config/audit/class_auditConfig.inc:57
 msgid "Number of days of audit to keep in the LDAP when cleaning"
@@ -62,7 +62,7 @@ msgstr "Événement d'audit"
 #: admin/audit/class_auditEvent.inc:54
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
-"Un événement comme une modification ldap qui a été enregistré par le plugin "
+"Un événement comme une modification LDAP qui a été enregistré par le plugin "
 "d'audit"
 
 #: admin/audit/class_auditEvent.inc:72
@@ -76,7 +76,7 @@ msgstr "Temps"
 
 #: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
-msgstr "Date et heure a laquelle cet événement est arrivé"
+msgstr "Date et heure à laquelle cet évènement est arrivé"
 
 #: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
diff --git a/audit/locale/hu_HU/fusiondirectory.po b/audit/locale/hu_HU/fusiondirectory.po
index 4680991764dbdc85e62ab54df9d09f25e8f2f8a9..125531d963f4e10ce17ad56399632cf083e60abd 100644
--- a/audit/locale/hu_HU/fusiondirectory.po
+++ b/audit/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/audit/locale/id/fusiondirectory.po b/audit/locale/id/fusiondirectory.po
index c9e7fa3c43b4a29d8a1e6cf6fbf529a342d86362..69a7a0551580a592913011db8d75eb9ca64be9e6 100644
--- a/audit/locale/id/fusiondirectory.po
+++ b/audit/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/audit/locale/it_IT/fusiondirectory.po b/audit/locale/it_IT/fusiondirectory.po
index ff0275f5b6dd7ab11cf49b6ec0da73332cd29b42..b4a453cf2d602ec9b3ee485628e8d8087b55d259 100644
--- a/audit/locale/it_IT/fusiondirectory.po
+++ b/audit/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/audit/locale/lv/fusiondirectory.po b/audit/locale/lv/fusiondirectory.po
index f51e56814a8b9a75f51b1bdbab9e98a052eec7ad..55bf9d627f0f203be7f5601cbfdc079aafc7c102 100644
--- a/audit/locale/lv/fusiondirectory.po
+++ b/audit/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/audit/locale/nb/fusiondirectory.po b/audit/locale/nb/fusiondirectory.po
index b05227fd8cebd3d00f00dd8f1dfa5c2bc5c6d1bd..4e04c70e1daeb115e6a34cde8bc59672c45a12bb 100644
--- a/audit/locale/nb/fusiondirectory.po
+++ b/audit/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/audit/locale/nl/fusiondirectory.po b/audit/locale/nl/fusiondirectory.po
index 22c13876dbb6d20103f7bc262be32d373eebaca9..823ab9749e831bb85eb224e8c1adc30cfd49eeac 100644
--- a/audit/locale/nl/fusiondirectory.po
+++ b/audit/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/audit/locale/pl/fusiondirectory.po b/audit/locale/pl/fusiondirectory.po
index eb62d90eefc11086180e074b0fc88b0fa4de0547..855ed12b6af2936491057319fa535fd5cfb26469 100644
--- a/audit/locale/pl/fusiondirectory.po
+++ b/audit/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/audit/class_auditConfig.inc:28
 msgid "Audit configuration"
diff --git a/audit/locale/pt/fusiondirectory.po b/audit/locale/pt/fusiondirectory.po
index b1415aa723a9aaf01c8ec5a3e34bedfd9ba1db59..a60a1f56c90d7163af219f5da5eaf5db88441e68 100644
--- a/audit/locale/pt/fusiondirectory.po
+++ b/audit/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/audit/locale/pt_BR/fusiondirectory.po b/audit/locale/pt_BR/fusiondirectory.po
index 3a082f362e1f44f80430e40956e828c17d763de0..a2595f5dd7b6d9100f4b5af8db1713707d764ef7 100644
--- a/audit/locale/pt_BR/fusiondirectory.po
+++ b/audit/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/audit/locale/ru/fusiondirectory.po b/audit/locale/ru/fusiondirectory.po
index 620eb0e6a488f26f68bca8bdc49f4979b49bd151..f4e56a47f28ba46d64002d510b39b6e494aad678 100644
--- a/audit/locale/ru/fusiondirectory.po
+++ b/audit/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/audit/locale/ru@petr1708/fusiondirectory.po b/audit/locale/ru@petr1708/fusiondirectory.po
index 08f4aad9ec97e722a55e752159cda9c1c921a8c0..9298492d6d1e7aeb38aaf8422197fae825f9a1b7 100644
--- a/audit/locale/ru@petr1708/fusiondirectory.po
+++ b/audit/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/audit/locale/sv/fusiondirectory.po b/audit/locale/sv/fusiondirectory.po
index 62e80cd57789b84e6633acf7a0f7d8a9f1dfe2d0..dd1c64ba09c222dda8e616890793907187a0f753 100644
--- a/audit/locale/sv/fusiondirectory.po
+++ b/audit/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/audit/locale/ug/fusiondirectory.po b/audit/locale/ug/fusiondirectory.po
index 8aa42a87f2e19abbcad046ac935d400ea3a89360..4cc76471584602c762670cc77d7a0a57e02749c6 100644
--- a/audit/locale/ug/fusiondirectory.po
+++ b/audit/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/audit/locale/vi_VN/fusiondirectory.po b/audit/locale/vi_VN/fusiondirectory.po
index 207a2aabb118b1007158b6d77933d6a5959fd1b4..219f62de28644ce94cd8cdbe08d7beebb0729c3a 100644
--- a/audit/locale/vi_VN/fusiondirectory.po
+++ b/audit/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/audit/locale/zh/fusiondirectory.po b/audit/locale/zh/fusiondirectory.po
index a304a5c20d8495cf75f380fa292a8f18a45b9b4c..e32edb0e0239ef8fe2f4f9a4ec20ad9eca702c12 100644
--- a/audit/locale/zh/fusiondirectory.po
+++ b/audit/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/autofs/locale/ar/fusiondirectory.po b/autofs/locale/ar/fusiondirectory.po
index 283559915ef0125c41daa434545f4c5521a123e1..1d52b0314fae65419e21e60094cf78367965b210 100644
--- a/autofs/locale/ar/fusiondirectory.po
+++ b/autofs/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/autofs/locale/ca/fusiondirectory.po b/autofs/locale/ca/fusiondirectory.po
index 540235667a7709282c56632cc013afae3157c6ed..b40f5fa051cec71975e8b905f866c963aad5747f 100644
--- a/autofs/locale/ca/fusiondirectory.po
+++ b/autofs/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/autofs/locale/cs_CZ/fusiondirectory.po b/autofs/locale/cs_CZ/fusiondirectory.po
index 49fda32e2b0ac6b4ea254b6fe0e1cdab6c8338c7..e2169e6d493089bd41489fc83f1390678ce76def 100644
--- a/autofs/locale/cs_CZ/fusiondirectory.po
+++ b/autofs/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/autofs/locale/de/fusiondirectory.po b/autofs/locale/de/fusiondirectory.po
index d7fffb7d9bbb0e68740fe9db53e9280e71f04991..078216bde7adf32d91d3ec7e4b071899bfa541b9 100644
--- a/autofs/locale/de/fusiondirectory.po
+++ b/autofs/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/autofs/locale/el_GR/fusiondirectory.po b/autofs/locale/el_GR/fusiondirectory.po
index 4b2c7c9fcfb8531649ce5e46295ebcdb556e3c7e..bde99a6089dbeb7fecb8603b483f4385c5129f7d 100644
--- a/autofs/locale/el_GR/fusiondirectory.po
+++ b/autofs/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/autofs/locale/en/fusiondirectory.po b/autofs/locale/en/fusiondirectory.po
index be8a7fd3f1db8f5549625d97a49556ba6b92ecdc..3822a30e17173987a109cc9a130f200e338bd76b 100644
--- a/autofs/locale/en/fusiondirectory.po
+++ b/autofs/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/autofs/locale/es/fusiondirectory.po b/autofs/locale/es/fusiondirectory.po
index e1d95facd23cbee529915f998d4936f88bd3bf9b..105434b645dd41c41ae25aba67906b3726669fb7 100644
--- a/autofs/locale/es/fusiondirectory.po
+++ b/autofs/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/autofs/locale/es_CO/fusiondirectory.po b/autofs/locale/es_CO/fusiondirectory.po
index 6d461eb039f68399629316a33fc21871bbb82756..224b3504c8beb1ebea7b6af40e2e988f5684d0ef 100644
--- a/autofs/locale/es_CO/fusiondirectory.po
+++ b/autofs/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/autofs/locale/es_VE/fusiondirectory.po b/autofs/locale/es_VE/fusiondirectory.po
index 7fdf1582197c9da41c811c3a65b257e63e2cc742..2add358bec9b221b9224ad45da1b25232564fd38 100644
--- a/autofs/locale/es_VE/fusiondirectory.po
+++ b/autofs/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/autofs/locale/fa_IR/fusiondirectory.po b/autofs/locale/fa_IR/fusiondirectory.po
index 0e06ce2cc6f159c4b0f44e8dd7a1d02e2255959e..150f03ca6f8d42b84b3a37ad8e97ca16c6b595b8 100644
--- a/autofs/locale/fa_IR/fusiondirectory.po
+++ b/autofs/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/fi_FI/fusiondirectory.po b/autofs/locale/fi_FI/fusiondirectory.po
index 473fa7a627d13331762f05076b03d64096a453c4..ccb3caf6177d56039a1667b6be2fdf4c6d635450 100644
--- a/autofs/locale/fi_FI/fusiondirectory.po
+++ b/autofs/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/autofs/locale/fr/fusiondirectory.po b/autofs/locale/fr/fusiondirectory.po
index 532a15eb0f33a64c6278608560cffdb3e6af93cd..246ca1f13ad408bdcac6207c58d77add8dbaf86a 100644
--- a/autofs/locale/fr/fusiondirectory.po
+++ b/autofs/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: config/autofs/class_autofsConfig.inc:28
 msgid "Autofs configuration"
-msgstr "Configuration Automount"
+msgstr "Configuration Autofs"
 
 #: config/autofs/class_autofsConfig.inc:29
 msgid "FusionDirectory autofs plugin configuration"
-msgstr "Configuration du plugin automount"
+msgstr "Configuration du plugin autofs"
 
 #: config/autofs/class_autofsConfig.inc:42
 msgid "AutoFS"
@@ -32,11 +32,11 @@ msgstr "AutoFS"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "AutoFS RDN"
-msgstr "RDN Automount"
+msgstr "Branche AutoFS"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "Branch in which automount info will be stored"
-msgstr "Branche où seront stockés  les point de montage automount"
+msgstr "Branche où seront stockés les points de montage automount"
 
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
@@ -60,8 +60,8 @@ msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
-"L'entrée de ce répertoire pour le démon automount. ⏎\n"
-"Par exemple «auto.u» ou «-fstype=nfs domaine.tld mount/répertoire '"
+"L'entrée de ce répertoire pour le démon automount. \n"
+"Par exemple «auto.u» ou «-fstype=nfs domaine.tld:/mount/répertoire'"
 
 #: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
@@ -70,11 +70,11 @@ msgstr "Point de montage"
 
 #: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
-msgstr "Le point de montage de ce répertoire sera mis dans"
+msgstr "Le point de montage dans lequel ce répertoire sera mis"
 
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
-msgstr "Automount"
+msgstr "Auto FS"
 
 #: admin/autofs/class_autofsManagement.inc:32
 msgid "Auto fs management"
diff --git a/autofs/locale/hu_HU/fusiondirectory.po b/autofs/locale/hu_HU/fusiondirectory.po
index da790c44d01888ce73d5be03f863d0bc4f1308c9..e1cc43045690169987518a1ed98c5c5407bb01eb 100644
--- a/autofs/locale/hu_HU/fusiondirectory.po
+++ b/autofs/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/autofs/locale/id/fusiondirectory.po b/autofs/locale/id/fusiondirectory.po
index 87ec970fd730283e73fd3364f287e97ed67385ce..682d2a6b988ee844ebb722a5016ca797fcb91f1f 100644
--- a/autofs/locale/id/fusiondirectory.po
+++ b/autofs/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/it_IT/fusiondirectory.po b/autofs/locale/it_IT/fusiondirectory.po
index 2bf4bed62d8c9fdb10713b19e1de0417494a478c..58ada90e1605082e8cda607320db9b0883e33e8b 100644
--- a/autofs/locale/it_IT/fusiondirectory.po
+++ b/autofs/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/autofs/locale/lv/fusiondirectory.po b/autofs/locale/lv/fusiondirectory.po
index dd91322f9e68417137e1671a24be24a20fe08d63..5e34d5390886fce4fb23cd84341c9784e80bad4d 100644
--- a/autofs/locale/lv/fusiondirectory.po
+++ b/autofs/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/autofs/locale/nb/fusiondirectory.po b/autofs/locale/nb/fusiondirectory.po
index 7507139b8819901a58c82d8a237424f2f50b9969..8af1363b56190e2456d64dbd3771dbe85f5ae4a9 100644
--- a/autofs/locale/nb/fusiondirectory.po
+++ b/autofs/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/autofs/locale/nl/fusiondirectory.po b/autofs/locale/nl/fusiondirectory.po
index 496876be25280876602ba8509e6a6a5761d99053..97e75a6fd6cdfadf1585c454ebd0b69c7a9face1 100644
--- a/autofs/locale/nl/fusiondirectory.po
+++ b/autofs/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/autofs/locale/pl/fusiondirectory.po b/autofs/locale/pl/fusiondirectory.po
index dc96e963dbb0d3aa768996b542d4acbd7dcfc8f8..3b0163502a559a55a1ab1c3b5f8b5ce2c43dc979 100644
--- a/autofs/locale/pl/fusiondirectory.po
+++ b/autofs/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/autofs/class_autofsConfig.inc:28
 msgid "Autofs configuration"
diff --git a/autofs/locale/pt/fusiondirectory.po b/autofs/locale/pt/fusiondirectory.po
index 4980ba70c7ccc94cba7a167b30a0768eb2024762..58653d7cc36cb3b33360568f17800bae198caf1f 100644
--- a/autofs/locale/pt/fusiondirectory.po
+++ b/autofs/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/autofs/locale/pt_BR/fusiondirectory.po b/autofs/locale/pt_BR/fusiondirectory.po
index a62153b2441c4ee1a584062d28edcfa0f87aaa94..68b2e60d76feb2240ad008c69eed2a4cebf373ff 100644
--- a/autofs/locale/pt_BR/fusiondirectory.po
+++ b/autofs/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/autofs/locale/ru/fusiondirectory.po b/autofs/locale/ru/fusiondirectory.po
index 217f3a61c694ec3660b68d9e9282ddd0e9774864..48fc46093bfe060f86e1349bfeea05b452157626 100644
--- a/autofs/locale/ru/fusiondirectory.po
+++ b/autofs/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/autofs/locale/ru@petr1708/fusiondirectory.po b/autofs/locale/ru@petr1708/fusiondirectory.po
index 6da85ef1341f567951d3f78fc5e7d5efc2c59012..bfc852e164b2621c63cea2fb1525063e58825289 100644
--- a/autofs/locale/ru@petr1708/fusiondirectory.po
+++ b/autofs/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/sv/fusiondirectory.po b/autofs/locale/sv/fusiondirectory.po
index 63393f9df18bea6e4e53563b7dd7f6097e600972..13a5cb19f28f3a4a8cf1c3c32236d57483b6ef10 100644
--- a/autofs/locale/sv/fusiondirectory.po
+++ b/autofs/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/autofs/locale/ug/fusiondirectory.po b/autofs/locale/ug/fusiondirectory.po
index 621b40a2697452575382d32027247eb8a43d6059..e2700d52b8ab6bc9a68f9503e2cfee1339a71b1b 100644
--- a/autofs/locale/ug/fusiondirectory.po
+++ b/autofs/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/vi_VN/fusiondirectory.po b/autofs/locale/vi_VN/fusiondirectory.po
index ce84b0f93e1aed8c5a5f6cf85222bc6cd9ca35bb..78c2250b4f6628d0243f6ce69dc092c22afddd61 100644
--- a/autofs/locale/vi_VN/fusiondirectory.po
+++ b/autofs/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/autofs/locale/zh/fusiondirectory.po b/autofs/locale/zh/fusiondirectory.po
index 013436efab363df18e883f5322de0cdd527db254..3bb1aacaaf9c8ab497129966a47dd50e55a4526b 100644
--- a/autofs/locale/zh/fusiondirectory.po
+++ b/autofs/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/certificates/locale/ar/fusiondirectory.po b/certificates/locale/ar/fusiondirectory.po
index f0ab5264d58bc7a7c3296d9f680d5c607667f0f6..9eabb33d4fde59dfb1ccb5e28c90a3711e6ded7c 100644
--- a/certificates/locale/ar/fusiondirectory.po
+++ b/certificates/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/ca/fusiondirectory.po b/certificates/locale/ca/fusiondirectory.po
index a058c1ab43a9d204d17d8c9b83cf35c562aa08fe..76295f78b3303cd6295f40d99e91e5d6f5718dfd 100644
--- a/certificates/locale/ca/fusiondirectory.po
+++ b/certificates/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/certificates/locale/cs_CZ/fusiondirectory.po b/certificates/locale/cs_CZ/fusiondirectory.po
index 14ea0d4499c0aff039a22d7eccf4b86a6903c029..9abe1991edcb5b2b6546b3413522671365b8aab5 100644
--- a/certificates/locale/cs_CZ/fusiondirectory.po
+++ b/certificates/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/certificates/locale/de/fusiondirectory.po b/certificates/locale/de/fusiondirectory.po
index 773a538bc8d773aad00c1b50d069f63cfee530e3..d634aee0435cc70727d6ccf141b72aaa8745d22b 100644
--- a/certificates/locale/de/fusiondirectory.po
+++ b/certificates/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/certificates/locale/el_GR/fusiondirectory.po b/certificates/locale/el_GR/fusiondirectory.po
index 62242c1a9d1fb968709908a7efd2bd69fc964a61..95cafce2303054cd0d109664ab8fbf356e7611a7 100644
--- a/certificates/locale/el_GR/fusiondirectory.po
+++ b/certificates/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/certificates/locale/en/fusiondirectory.po b/certificates/locale/en/fusiondirectory.po
index 08372378ae6028becd8ee02188af052f6abde29b..fca4a238d1713a0f0c788859e5cf3207ae034c4f 100644
--- a/certificates/locale/en/fusiondirectory.po
+++ b/certificates/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/certificates/locale/es/fusiondirectory.po b/certificates/locale/es/fusiondirectory.po
index 6aa7c69cf3d1e6714f54a41fc86a0c4c201cee52..903a6dfd92bc396bb2b2c3f9250af8559142d466 100644
--- a/certificates/locale/es/fusiondirectory.po
+++ b/certificates/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/certificates/locale/es_CO/fusiondirectory.po b/certificates/locale/es_CO/fusiondirectory.po
index 92993d355de4a8e21878dd02d6223ca0dc3d90c8..bb65eeddd0694b0c6056ec4481cf4e9b0ca51698 100644
--- a/certificates/locale/es_CO/fusiondirectory.po
+++ b/certificates/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/certificates/locale/es_VE/fusiondirectory.po b/certificates/locale/es_VE/fusiondirectory.po
index 50dbeb9863f40dd0bcb826b007cd9f6f21505284..e006f26d70d80a76635b27e2c26dabb2c006a834 100644
--- a/certificates/locale/es_VE/fusiondirectory.po
+++ b/certificates/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/certificates/locale/fa_IR/fusiondirectory.po b/certificates/locale/fa_IR/fusiondirectory.po
index 0da771df4825c8eaac1ac12a910c693939a09748..31ee72c4d0e874905cc3a329d1fb14a897729334 100644
--- a/certificates/locale/fa_IR/fusiondirectory.po
+++ b/certificates/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/fi_FI/fusiondirectory.po b/certificates/locale/fi_FI/fusiondirectory.po
index c5f5d0340096023f5d338c1e37f7a0c1d5933476..0fa7178854694141e57b108de5111844428c1e66 100644
--- a/certificates/locale/fi_FI/fusiondirectory.po
+++ b/certificates/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/certificates/locale/fr/fusiondirectory.po b/certificates/locale/fr/fusiondirectory.po
index b95b19b2344b25042f97886e63fd7a8f1b6a2211..50e7c6c46a988b5678d9bc7aefe8b72b97c1adc6 100644
--- a/certificates/locale/fr/fusiondirectory.po
+++ b/certificates/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/certificates/locale/hu_HU/fusiondirectory.po b/certificates/locale/hu_HU/fusiondirectory.po
index 4d04511a798a5c7f029caeae222ccaf1806c9eba..06fd5a8227a22ab9a19bab563e478c391524cb6b 100644
--- a/certificates/locale/hu_HU/fusiondirectory.po
+++ b/certificates/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/id/fusiondirectory.po b/certificates/locale/id/fusiondirectory.po
index 00bb5f7ce86f9991505f6970c0c77e9f98328a57..b203c96c3ba8e26832062945a1605d7836d94357 100644
--- a/certificates/locale/id/fusiondirectory.po
+++ b/certificates/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/it_IT/fusiondirectory.po b/certificates/locale/it_IT/fusiondirectory.po
index a86a10178dbd1da8df37740b12c36d911044a5b5..294a018be11c9c28d72d9729c929afeb0f38e2f5 100644
--- a/certificates/locale/it_IT/fusiondirectory.po
+++ b/certificates/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/certificates/locale/lv/fusiondirectory.po b/certificates/locale/lv/fusiondirectory.po
index e8d2c6573d3540074e88ade1b81197c18bae7f09..b36dedce21b47b57c30d9c6b05fdf593b76eac75 100644
--- a/certificates/locale/lv/fusiondirectory.po
+++ b/certificates/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/nb/fusiondirectory.po b/certificates/locale/nb/fusiondirectory.po
index 9d1bbdcb66fed1347fa5c9cae729e13b6096da58..b11157d224ae166da7739f043b02901e610d5ead 100644
--- a/certificates/locale/nb/fusiondirectory.po
+++ b/certificates/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/nl/fusiondirectory.po b/certificates/locale/nl/fusiondirectory.po
index 173512e5833c1a36aa4af21fa8549f17a115f206..2c647385dcde4b682fb87be8c05bb9c52baf2d90 100644
--- a/certificates/locale/nl/fusiondirectory.po
+++ b/certificates/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/certificates/locale/pl/fusiondirectory.po b/certificates/locale/pl/fusiondirectory.po
index e5842de2ac394bcf246f580dde68b0a652d0c123..fbabebbefc1262a5e06289fdaa3781a9930cdcf5 100644
--- a/certificates/locale/pl/fusiondirectory.po
+++ b/certificates/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/certificates/class_userCertificates.inc:31
 #: personal/certificates/class_userCertificates.inc:32
diff --git a/certificates/locale/pt/fusiondirectory.po b/certificates/locale/pt/fusiondirectory.po
index 1aab3fb0fb7afa2a97a4297dcf1d477528e9c0e6..91761d2d6ffe37c347fb770719b2acc6ae0caa0a 100644
--- a/certificates/locale/pt/fusiondirectory.po
+++ b/certificates/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/certificates/locale/pt_BR/fusiondirectory.po b/certificates/locale/pt_BR/fusiondirectory.po
index 289934138be1f20a1cf173bddb40403a4d636615..9ff6ea0541935f3f4eeb95bede3260ea7f20608d 100644
--- a/certificates/locale/pt_BR/fusiondirectory.po
+++ b/certificates/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/certificates/locale/ru/fusiondirectory.po b/certificates/locale/ru/fusiondirectory.po
index c3f5bb7b2794efff0e1f9f8d5e72caeab64a4c61..9b50294d529cd39c8df7751d014e41bef229130c 100644
--- a/certificates/locale/ru/fusiondirectory.po
+++ b/certificates/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/certificates/locale/ru@petr1708/fusiondirectory.po b/certificates/locale/ru@petr1708/fusiondirectory.po
index f8426b9c8293c8413add40dd65369e66f47f96d6..537f9cdcdcfd0a176d5dbd87629eda8a13767d30 100644
--- a/certificates/locale/ru@petr1708/fusiondirectory.po
+++ b/certificates/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/sv/fusiondirectory.po b/certificates/locale/sv/fusiondirectory.po
index a0b2885dfd9dabc332a7f968fec94a92fdb60ff9..39f151b12b0fdc10dc73c4262a55382f175d1da2 100644
--- a/certificates/locale/sv/fusiondirectory.po
+++ b/certificates/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/certificates/locale/ug/fusiondirectory.po b/certificates/locale/ug/fusiondirectory.po
index b8ae4d09aee6f6703bd9855241f6c2a47d6d5db0..7a6dc4d09abede933226b8ba74e8bf6456296cf7 100644
--- a/certificates/locale/ug/fusiondirectory.po
+++ b/certificates/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/vi_VN/fusiondirectory.po b/certificates/locale/vi_VN/fusiondirectory.po
index 59e1502e5136c7f6ba6d8c9c64de26e1e75c6b0e..bf54dbeb4534556c7a3e706b1f0a0085ea4e1961 100644
--- a/certificates/locale/vi_VN/fusiondirectory.po
+++ b/certificates/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/certificates/locale/zh/fusiondirectory.po b/certificates/locale/zh/fusiondirectory.po
index 164b8c5a681d596b972ba02318629a48fe5775e3..b5a8080697e1672c2c3ccb212ea1428718f924a3 100644
--- a/certificates/locale/zh/fusiondirectory.po
+++ b/certificates/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/community/locale/ar/fusiondirectory.po b/community/locale/ar/fusiondirectory.po
index c55085fd0b4b35b717062f6ed3e861df133b9e27..34c3e1761aa5f1a8f02d5fb93c0c8d458023f717 100644
--- a/community/locale/ar/fusiondirectory.po
+++ b/community/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/community/locale/ca/fusiondirectory.po b/community/locale/ca/fusiondirectory.po
index 4d15c93ab7897f52813d1c6f7ba15572dd031e81..aed7cfe2bae9139f3c0d9faafbc3c797f7b42cf4 100644
--- a/community/locale/ca/fusiondirectory.po
+++ b/community/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/community/locale/cs_CZ/fusiondirectory.po b/community/locale/cs_CZ/fusiondirectory.po
index 7dcc9b844053d406c7762eeb5615baa9da31b265..707a661dad4a92f3f3738017803bbb43d2bee753 100644
--- a/community/locale/cs_CZ/fusiondirectory.po
+++ b/community/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/community/locale/de/fusiondirectory.po b/community/locale/de/fusiondirectory.po
index 9de4d5c115a945b7cbf548f9977197fe00fbee36..b17d42b07e170d58570248489c1ac5b963b6446a 100644
--- a/community/locale/de/fusiondirectory.po
+++ b/community/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/community/locale/el_GR/fusiondirectory.po b/community/locale/el_GR/fusiondirectory.po
index 059bcd848bee5fa47620b8133852dc60dfb7ff4e..431cfba6fdb80ae7f2771fd8a65dc1d66b1b03e1 100644
--- a/community/locale/el_GR/fusiondirectory.po
+++ b/community/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/community/locale/en/fusiondirectory.po b/community/locale/en/fusiondirectory.po
index e7c8facd707353a5a1da3958086a32cd2e1873a0..abf81f6d8be01213e8768b1581932e46b8bb9673 100644
--- a/community/locale/en/fusiondirectory.po
+++ b/community/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/community/locale/es/fusiondirectory.po b/community/locale/es/fusiondirectory.po
index 9b575dced84ff9a90eef24fa674d20e837ac10b8..9d72bce4f69c5b5bfeaaa8e0263b0846569d1508 100644
--- a/community/locale/es/fusiondirectory.po
+++ b/community/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/community/locale/es_CO/fusiondirectory.po b/community/locale/es_CO/fusiondirectory.po
index 464a1bf60240d4912452666e278d2261a3905a00..d47280ef6cf600cdd78d857faac723bfc07b15eb 100644
--- a/community/locale/es_CO/fusiondirectory.po
+++ b/community/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/community/locale/es_VE/fusiondirectory.po b/community/locale/es_VE/fusiondirectory.po
index 741cf24c7a672b7f2a78be76119de25454e1ad66..3de0116363f1376afe2a078e1634ebba55648a42 100644
--- a/community/locale/es_VE/fusiondirectory.po
+++ b/community/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/community/locale/fa_IR/fusiondirectory.po b/community/locale/fa_IR/fusiondirectory.po
index 5db1055510fdc360867121b89962f2368e8f7166..b9983894e8a4f1eec94a735a795b50c447bdeb1e 100644
--- a/community/locale/fa_IR/fusiondirectory.po
+++ b/community/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/community/locale/fi_FI/fusiondirectory.po b/community/locale/fi_FI/fusiondirectory.po
index c9a4ba7c1d61a61468b6ba9d2451a1f17a1548ff..de84db6df8670459e7edef660178783be24be2e4 100644
--- a/community/locale/fi_FI/fusiondirectory.po
+++ b/community/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/community/locale/fr/fusiondirectory.po b/community/locale/fr/fusiondirectory.po
index 7c765f6ee5b069ff87f9fa4f4a6bd6825335091b..9dc60fd3e4ea218b0a4b8244b29fb738a30cd6ce 100644
--- a/community/locale/fr/fusiondirectory.po
+++ b/community/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,24 +20,24 @@ msgstr ""
 
 #: config/community/class_communityConfig.inc:28
 msgid "Community configuration"
-msgstr "Configuration de Communauté"
+msgstr "Configuration de communauté"
 
 #: config/community/class_communityConfig.inc:29
 msgid "FusionDirectory community plugin configuration"
-msgstr "Configuration du plugin communautaire FusionDirectory"
+msgstr "Configuration du plugin communautaire"
 
 #: config/community/class_communityConfig.inc:41
 msgid "Community"
-msgstr "Projet communautaire"
+msgstr "Communauté"
 
 #: config/community/class_communityConfig.inc:45
 msgid "Membership type choices"
-msgstr "Choix du type d'adhésion"
+msgstr "Choix de type d'adhésion"
 
 #: config/community/class_communityConfig.inc:45
 msgid "Community membership types available in the user community tab"
 msgstr ""
-"Types d'adhésion disponibles dans l'onglet communauté de cet d'utilisateur"
+"Types d'adhésion disponibles dans l’onglet communauté des utilisateurs"
 
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
@@ -53,7 +53,7 @@ msgstr "Projet"
 
 #: admin/departments/community/class_communityProject.inc:45
 msgid "Project full name"
-msgstr "Nom complet du projet"
+msgstr "Nom complet"
 
 #: admin/departments/community/class_communityProject.inc:45
 msgid "Full name of this project"
@@ -61,7 +61,7 @@ msgstr "Nom complet de ce projet"
 
 #: admin/departments/community/class_communityProject.inc:49
 msgid "Project key"
-msgstr "Clef de projet"
+msgstr "Clé de projet"
 
 #: admin/departments/community/class_communityProject.inc:49
 msgid "ID used for this project in other softwares or databases"
@@ -81,7 +81,7 @@ msgstr "Adhésion"
 
 #: admin/departments/community/class_communityOrganization.inc:45
 msgid "Membership type"
-msgstr "Types adhésion"
+msgstr "Type adhésion"
 
 #: admin/departments/community/class_communityOrganization.inc:45
 msgid "Membership type of this organization"
@@ -89,19 +89,19 @@ msgstr "Choix du type d'adhésion de cette organisation"
 
 #: admin/departments/community/class_communityOrganization.inc:50
 msgid "Active"
-msgstr "actif"
+msgstr "Active"
 
 #: admin/departments/community/class_communityOrganization.inc:50
 msgid "Is the membership of this organization active"
-msgstr "Est ce que le membership de cette organisation est actif ?"
+msgstr "Est-ce que l’adhésion de cette organisation est active ?"
 
 #: admin/departments/community/class_communityOrganization.inc:54
 msgid "Hidden"
-msgstr "Cache"
+msgstr "Cachée"
 
 #: admin/departments/community/class_communityOrganization.inc:54
 msgid "Should this membership be hidden from listings"
-msgstr "Est ce que cette adhésion est caché dans les listes"
+msgstr "Est-ce que cette adhésion est cachée des listes"
 
 #: admin/departments/community/class_communityOrganization.inc:60
 msgid "Dates"
@@ -109,15 +109,15 @@ msgstr "Dates"
 
 #: admin/departments/community/class_communityOrganization.inc:63
 msgid "Start date"
-msgstr "Date de début"
+msgstr "Début"
 
 #: admin/departments/community/class_communityOrganization.inc:63
 msgid "Date of the beginning"
-msgstr "Date de Création"
+msgstr "Date de début"
 
 #: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
-msgstr "Date de fin"
+msgstr "Fin"
 
 #: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
diff --git a/community/locale/hu_HU/fusiondirectory.po b/community/locale/hu_HU/fusiondirectory.po
index ebfeeb411fb1bb1c84143e83cc0d8b6c282249d8..e9539c96cdd2dbdb100ab1848e7d17ef1f6b5b19 100644
--- a/community/locale/hu_HU/fusiondirectory.po
+++ b/community/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/id/fusiondirectory.po b/community/locale/id/fusiondirectory.po
index c1c17538ef1f72137c902b829a96191b084f16fb..c72b94219596c90a311fa9a7d96e272397d1d6ad 100644
--- a/community/locale/id/fusiondirectory.po
+++ b/community/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/it_IT/fusiondirectory.po b/community/locale/it_IT/fusiondirectory.po
index a4da33323628a6f5f9c60ac58d95c44041538a97..0df2f9f43575f86b6e22a713f1b03ec1fab09cbc 100644
--- a/community/locale/it_IT/fusiondirectory.po
+++ b/community/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/community/locale/lv/fusiondirectory.po b/community/locale/lv/fusiondirectory.po
index d310293d03739b9982b233ae4f98f29c64582b1c..b12dd9a916aa49942f3f5f4ce2f63ed38d828473 100644
--- a/community/locale/lv/fusiondirectory.po
+++ b/community/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/community/locale/nb/fusiondirectory.po b/community/locale/nb/fusiondirectory.po
index 6c282000f2f3f9da3400db4128b753b2fe19b548..c6b5cc157061a82ea498cc024c4d165a59166ea3 100644
--- a/community/locale/nb/fusiondirectory.po
+++ b/community/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/nl/fusiondirectory.po b/community/locale/nl/fusiondirectory.po
index 9533703b33b55c4f8db0d251c99e010d9e7ccd01..e8e04dacd06745f8ac9ec1ceaa433db488934f15 100644
--- a/community/locale/nl/fusiondirectory.po
+++ b/community/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/community/locale/pl/fusiondirectory.po b/community/locale/pl/fusiondirectory.po
index fd6a03c3d50effd2697aaf72db375cae55e12356..b318ae6dd9e8959c9f4a9be35bf984cf23ffbbd8 100644
--- a/community/locale/pl/fusiondirectory.po
+++ b/community/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/community/class_communityConfig.inc:28
 msgid "Community configuration"
diff --git a/community/locale/pt/fusiondirectory.po b/community/locale/pt/fusiondirectory.po
index 438e6f8cd293940348f9fb4bb1cda263694765ff..8001bb45704e1d22c2941fe273db7fb717261777 100644
--- a/community/locale/pt/fusiondirectory.po
+++ b/community/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/community/locale/pt_BR/fusiondirectory.po b/community/locale/pt_BR/fusiondirectory.po
index e5fef36f91133908afdf6ba2877317a740669b7c..2cc5fc1e1e540bc492aa746d0baa6167d8cc33d1 100644
--- a/community/locale/pt_BR/fusiondirectory.po
+++ b/community/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/community/locale/ru/fusiondirectory.po b/community/locale/ru/fusiondirectory.po
index 009f8b86218a5788d4294ef590b0c5bf306e0704..2e7699c3a3bf2e47c00931c046e42199aa182315 100644
--- a/community/locale/ru/fusiondirectory.po
+++ b/community/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/community/locale/ru@petr1708/fusiondirectory.po b/community/locale/ru@petr1708/fusiondirectory.po
index 3cd9a8f2867faffbee1c1d14172b173f53dd0e21..3b1907b8829cea11113c481c4732370f695ca756 100644
--- a/community/locale/ru@petr1708/fusiondirectory.po
+++ b/community/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/sv/fusiondirectory.po b/community/locale/sv/fusiondirectory.po
index ed6812f581e14b6ef7307c9602b2e315b45ee07d..af593d3ea8e382ed96618febfba855dad8a8e8a4 100644
--- a/community/locale/sv/fusiondirectory.po
+++ b/community/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/community/locale/ug/fusiondirectory.po b/community/locale/ug/fusiondirectory.po
index 12f510ad8970917512e7a6392929ff999c20d1cb..3c9a2893342b424906ba52d2cb669804473e7ca3 100644
--- a/community/locale/ug/fusiondirectory.po
+++ b/community/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/vi_VN/fusiondirectory.po b/community/locale/vi_VN/fusiondirectory.po
index 8768f636f5095ff97b2fd3887f4806a29a5e4bab..33eb136d7c57b8f000632f621c9336f77f80c964 100644
--- a/community/locale/vi_VN/fusiondirectory.po
+++ b/community/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/community/locale/zh/fusiondirectory.po b/community/locale/zh/fusiondirectory.po
index ecebfdd99412e0f3b7b84d4241c691d7d72b193c..3df1cd125ae5c41b2066eb2c97dd7c06f48280f9 100644
--- a/community/locale/zh/fusiondirectory.po
+++ b/community/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/cyrus/locale/ar/fusiondirectory.po b/cyrus/locale/ar/fusiondirectory.po
index dc9ff8898ac6df1fd2b298e6262d8ff148d574b3..b2a4a4c11056c7b1e80b5c4cc47f53830885fa52 100644
--- a/cyrus/locale/ar/fusiondirectory.po
+++ b/cyrus/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/ca/fusiondirectory.po b/cyrus/locale/ca/fusiondirectory.po
index 02afd44fad52ab20535fe6dbc0dd23a90b0ceb0d..5067c06d09b684ac00e2c2955c30171e55855d92 100644
--- a/cyrus/locale/ca/fusiondirectory.po
+++ b/cyrus/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/cs_CZ/fusiondirectory.po b/cyrus/locale/cs_CZ/fusiondirectory.po
index c38be2d9d21a969b559a2603fecd592c49166b50..f1437cd34ba05b0282867967fdfec5e1e2c239f2 100644
--- a/cyrus/locale/cs_CZ/fusiondirectory.po
+++ b/cyrus/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -58,12 +58,12 @@ msgstr "Modul imap_getacl není implementován!"
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Nedaří se získat skript Sieve: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Nedaří se uložit skript Sieve: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Nedaří se aktivovat skript Sieve: %s"
diff --git a/cyrus/locale/de/fusiondirectory.po b/cyrus/locale/de/fusiondirectory.po
index 066e93e181f14e478dd160e6bc962e3edbb018ea..bd68a637d01d7876e69325c7218dac7ff7ee9b5b 100644
--- a/cyrus/locale/de/fusiondirectory.po
+++ b/cyrus/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -58,12 +58,12 @@ msgstr "Die Funktion imap_getacl ist nicht implementiert!"
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht beziehen: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht speichern: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Kann das Sieve-Skript nicht aktivieren: %s"
diff --git a/cyrus/locale/el_GR/fusiondirectory.po b/cyrus/locale/el_GR/fusiondirectory.po
index b0f61af8199a1c63c0532d62ee996f9c0f9d4101..5fbb3758f97669a6e36a3759eacb4fb8ea8aa982 100644
--- a/cyrus/locale/el_GR/fusiondirectory.po
+++ b/cyrus/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -58,12 +58,12 @@ msgstr "Το module imap_getacl  δεν έχει εφαρμοστεί!"
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Αδυναμία λήψης SIEVE script: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Αδυναμία αποθήκευσης SIEVE script: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Αδυναμία ενεργοποίησης SIEVE script: %s"
diff --git a/cyrus/locale/en/fusiondirectory.po b/cyrus/locale/en/fusiondirectory.po
index d689f8f2dacaeff2d766fb4b13a6ead78468d3ae..138d0dccc390f3d16113060f8c6456df6de78bd8 100644
--- a/cyrus/locale/en/fusiondirectory.po
+++ b/cyrus/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -55,12 +55,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/es/fusiondirectory.po b/cyrus/locale/es/fusiondirectory.po
index 345ed4318d0d578b8f75dfd1f61f03b43629d74f..36a0240f3493ae1b3aa5eeb30ac09846a91ce3b0 100644
--- a/cyrus/locale/es/fusiondirectory.po
+++ b/cyrus/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -58,12 +58,12 @@ msgstr "¡No se ha implementado el módulo imap_getacl!"
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "No se puede acceder al script SIEVE: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "No se puede guardar el script SIEVE: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "No se puede activar el script SIEVE: %s"
diff --git a/cyrus/locale/es_CO/fusiondirectory.po b/cyrus/locale/es_CO/fusiondirectory.po
index 86282987c3c982edaa8ff5b2ebb926b3db8be084..3a5e7a6d39112f485696d4003c39143f712751b1 100644
--- a/cyrus/locale/es_CO/fusiondirectory.po
+++ b/cyrus/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/es_VE/fusiondirectory.po b/cyrus/locale/es_VE/fusiondirectory.po
index 98a1332d59638672b4ec1a0465ab92ea7ca156b5..08abcbbb0d11eadcb7bce8b4f1ad6de812ec8892 100644
--- a/cyrus/locale/es_VE/fusiondirectory.po
+++ b/cyrus/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -58,12 +58,12 @@ msgstr "¡No se ha implementado el módulo imap_getacl!"
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "No se puede acceder al script SIEVE: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "No se puede guardar el script SIEVE: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "No se puede activar el script SIEVE: %s"
diff --git a/cyrus/locale/fa_IR/fusiondirectory.po b/cyrus/locale/fa_IR/fusiondirectory.po
index 45fa6f740df943f27a5519e79b177afb5fdaa3a3..8304f937ab4beba991095d1bfce30d3246b6ee09 100644
--- a/cyrus/locale/fa_IR/fusiondirectory.po
+++ b/cyrus/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -55,12 +55,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/fi_FI/fusiondirectory.po b/cyrus/locale/fi_FI/fusiondirectory.po
index 245ae4f187e2c7054c0a57d1b71c004a2da0b378..a9b33844cfbae6901524dcaf7671a3449afd5cab 100644
--- a/cyrus/locale/fi_FI/fusiondirectory.po
+++ b/cyrus/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Ei pysty noutamaan SIEVE skriptia: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/fr/fusiondirectory.po b/cyrus/locale/fr/fusiondirectory.po
index 67e5585bd8a796e575f56cd379cfb77c7a69e6c0..829deee0fda22b4204c8202687b01260506522ef 100644
--- a/cyrus/locale/fr/fusiondirectory.po
+++ b/cyrus/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Il n'y a aucun serveur IMAP compatibles définis !"
+msgstr "Il n'y a aucun serveur IMAP compatible défini !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
-msgstr "Le serveur de messagerie pour ce compte est non valide !"
+msgstr "Le serveur de courriel pour ce compte est invalide !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
@@ -33,13 +33,11 @@ msgstr "Erreur IMAP"
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-"Impossible de modifier le quota de la boite de messagerie IMAP. Le serveur "
-"répond : %s"
+msgstr "Impossible de modifier le quota de la boite IMAP : %s"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
-msgstr "Informations de messagerie"
+msgstr "Informations de courriel"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
@@ -47,25 +45,25 @@ msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
 msgstr ""
-"L'entrée LDAP à été supprimée mais le compte de messagerie (%s) est toujours présent dans cyrus.\n"
-"Veuillez l'effacer manuellement !"
+"L'entrée LDAP a été supprimée mais la boite de courriel (%s) est toujours présente dans cyrus.\n"
+"Veuillez la supprimer manuellement !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
-msgstr "Le module imap_getacl n'est pas implémenté !"
+msgstr "Le module imap_getacl n’est pas implémenté !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Impossible de récupérer le script SIEVE : %s"
+msgstr "Impossible de récupérer le script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Impossible de stocker le script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Impossible d'activer le script SIEVE : %s"
@@ -77,7 +75,7 @@ msgstr "Cyrus (IMAP/POP3)"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Services"
-msgstr "Service"
+msgstr "Services"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:45
 msgid "Cyrus settings"
@@ -90,7 +88,7 @@ msgstr "URL de connexion au serveur Cyrus"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:52
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:93
 msgid "Hostname"
-msgstr "Nom de l'hôte"
+msgstr "Nom d’hôte"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:52
 msgid "Hostname of the Cyrus server"
@@ -116,11 +114,11 @@ msgstr "Options pour contacter le serveur Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Valide certificats"
-msgstr "Valider les certificats"
+msgstr "Vérifier le certificat"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Weither or not to validate server certificate on connexion"
-msgstr "Valider ou ne pas valider le certificat du serveur à la connexion"
+msgstr "Valider ou non le certificat du serveur à la connexion"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Admin user"
@@ -128,7 +126,7 @@ msgstr "Administrateur"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Imap server admin user"
-msgstr "Administrateur du serveur Imap"
+msgstr "Utilisateur administrateur du serveur IMAP"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:80
 msgid "Password"
@@ -136,7 +134,7 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:80
 msgid "Admin user password"
-msgstr "Mot de passe utilisateur Administrateur"
+msgstr "Mot de passe de l’utilisateur administrateur"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:86
 msgid "Sieve settings"
@@ -144,11 +142,11 @@ msgstr "Paramètres Sieve"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:89
 msgid "Sieve connect URL for Cyrus server"
-msgstr "URL de connexion pour le serveur Sieve de Cyrus"
+msgstr "URL de connexion Sieve pour le serveur Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:93
 msgid "Hostname of the Cyrus sieve server"
-msgstr "Nom d'hôte du serveur sieve Cyrus"
+msgstr "Nom d'hôte du serveur Sieve de Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:97
 msgid "Port number on which Cyrus sieve server should be contacted"
diff --git a/cyrus/locale/hu_HU/fusiondirectory.po b/cyrus/locale/hu_HU/fusiondirectory.po
index 29d81825113a1e09a172b3e69ebe43ea42899920..eaf6a6ea7ea51e3418f8c74ed8b983a890434800 100644
--- a/cyrus/locale/hu_HU/fusiondirectory.po
+++ b/cyrus/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -55,12 +55,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/id/fusiondirectory.po b/cyrus/locale/id/fusiondirectory.po
index 8cb865c83dac2f9842f867af7b4fe5e2f65a778f..6dd21a432f1a93fa3387380c470487ce272c1e3a 100644
--- a/cyrus/locale/id/fusiondirectory.po
+++ b/cyrus/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -55,12 +55,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/it_IT/fusiondirectory.po b/cyrus/locale/it_IT/fusiondirectory.po
index ce8b964f14646cd7edd380f73503bb6d739b5838..ced4602d02235d3578e6546c7bdb698cf18ff2c8 100644
--- a/cyrus/locale/it_IT/fusiondirectory.po
+++ b/cyrus/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -59,12 +59,12 @@ msgstr "Il modulo imap_getacl non è implementato !"
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Impossibile recuperare lo script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Impossibile memorizzare lo script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Impossibile attivare lo script SIEVE : %s"
diff --git a/cyrus/locale/lv/fusiondirectory.po b/cyrus/locale/lv/fusiondirectory.po
index 554737bc9bd14aa1fefe03ba3defd4eb30086f64..ae7fe3f0a0fad0591237a5dfa7f6c75ddb9e316c 100644
--- a/cyrus/locale/lv/fusiondirectory.po
+++ b/cyrus/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -55,12 +55,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/nb/fusiondirectory.po b/cyrus/locale/nb/fusiondirectory.po
index 9767ba21676c149fb6b91891d79d55ec9bb4d650..dd623a98c10a7da8ac8038ba232cd1d89dbd525b 100644
--- a/cyrus/locale/nb/fusiondirectory.po
+++ b/cyrus/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -55,12 +55,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/nl/fusiondirectory.po b/cyrus/locale/nl/fusiondirectory.po
index d10c38408171d81bb95b614eccc2b16ef6aa4fba..b71cb560abe8c2de573066c894dbc81f89be32a3 100644
--- a/cyrus/locale/nl/fusiondirectory.po
+++ b/cyrus/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -58,12 +58,12 @@ msgstr "De module imap_getacl is niet geïmplementeerd!"
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Kan SIEVE script niet vinden : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Kan SIEVE script niet opslaan : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Kan SIEVE script niet activeren : %s"
diff --git a/cyrus/locale/pl/fusiondirectory.po b/cyrus/locale/pl/fusiondirectory.po
index f06fe0169f7052826126c0485be657c2a77afe0f..446e74962bb9a476c4cb3bcfae6e008d7d760f0e 100644
--- a/cyrus/locale/pl/fusiondirectory.po
+++ b/cyrus/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/pt/fusiondirectory.po b/cyrus/locale/pt/fusiondirectory.po
index dfd0bf91365260ffc5d2b14670c64e6295d65e3a..6a58049c72a0c4810a0d70ff75ca50d65d625517 100644
--- a/cyrus/locale/pt/fusiondirectory.po
+++ b/cyrus/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/pt_BR/fusiondirectory.po b/cyrus/locale/pt_BR/fusiondirectory.po
index fd2c61889026830fc8cb202f94a78752dbadf162..51bedcde699e1698792d9a2af0dae9311f519b8e 100644
--- a/cyrus/locale/pt_BR/fusiondirectory.po
+++ b/cyrus/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -58,12 +58,12 @@ msgstr "O modulo imap_getacl não está implementado!"
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Não é possível recuperar script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Não é possível armazenar script SIEVE:%s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Não é possível ativar script SIEVE:%s"
diff --git a/cyrus/locale/ru/fusiondirectory.po b/cyrus/locale/ru/fusiondirectory.po
index a6b3995a95c66cd24b7682136ccd5e91196eef86..14f5b10705ed3185b077366522603ccab389ca5b 100644
--- a/cyrus/locale/ru/fusiondirectory.po
+++ b/cyrus/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/ru@petr1708/fusiondirectory.po b/cyrus/locale/ru@petr1708/fusiondirectory.po
index fad4ef9a5c9c93ec32b098b2fa030c3a148511d6..0aa96dfbc4bb22c6e1ed21258e205900f6adc0bc 100644
--- a/cyrus/locale/ru@petr1708/fusiondirectory.po
+++ b/cyrus/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -55,12 +55,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/sv/fusiondirectory.po b/cyrus/locale/sv/fusiondirectory.po
index fb42bcbaefa813866f9eabe5ed45c1201b076a46..64810f4350b9cb905cfdad8888feeef4e59de53f 100644
--- a/cyrus/locale/sv/fusiondirectory.po
+++ b/cyrus/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/ug/fusiondirectory.po b/cyrus/locale/ug/fusiondirectory.po
index 28a474764f7d2af7be284c70526998e1c0ab42cc..2d8c3545faec466445f0c3fcb74754268cdfab21 100644
--- a/cyrus/locale/ug/fusiondirectory.po
+++ b/cyrus/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -55,12 +55,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/vi_VN/fusiondirectory.po b/cyrus/locale/vi_VN/fusiondirectory.po
index 6268c69d0d1b6cf071800fa22c9b7fe0ac3bd3f1..30ba451b7e04421176f4f5b2f360c947d786ff70 100644
--- a/cyrus/locale/vi_VN/fusiondirectory.po
+++ b/cyrus/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/zh/fusiondirectory.po b/cyrus/locale/zh/fusiondirectory.po
index 702689430e9e12b1a13110afeffcfe71bfc23c3f..8b4e7e91da0858d9c5a66a0c1a548412b93505ee 100644
--- a/cyrus/locale/zh/fusiondirectory.po
+++ b/cyrus/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc b/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
index 8fa1deff78f28ac716ce81da8fa79c8063c8a8db..00717ae2cd80bedb689f7c6991d8dfaaedcd17b0 100644
--- a/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
+++ b/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
@@ -509,8 +509,7 @@ class mailMethodCyrus extends mailMethod
         if (!$sieve->sieve_getscript('fusiondirectory')) {
           $this->error = sprintf(_('Cannot retrieve SIEVE script: %s'), to_string($sieve->error_raw));
           @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $sieve->error_raw,
-              "<b>SIEVE: Connot read 'fusiondirectory' sieve script.</b>");
-          $this->error = $sieve->error_raw;
+              "<b>SIEVE: Cannot read 'fusiondirectory' sieve script.</b>");
           return FALSE;
         }
 
@@ -588,6 +587,7 @@ class mailMethodCyrus extends mailMethod
     }
 
     $sieve->sieve_logout();
+    return TRUE;
   }
 
   static public function get_server_list()
diff --git a/debconf/locale/ar/fusiondirectory.po b/debconf/locale/ar/fusiondirectory.po
index 33458219b3c78f28d9ea0b18302856c67c4c0e01..d9680a73d9f76d5cdfb2aa917b6afef4c9502fdd 100644
--- a/debconf/locale/ar/fusiondirectory.po
+++ b/debconf/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/debconf/locale/ca/fusiondirectory.po b/debconf/locale/ca/fusiondirectory.po
index b2b203fc207dfe3455074d51b793144d3b4e346d..c1d69132c11fd133de5c112b622b555e4fecb22e 100644
--- a/debconf/locale/ca/fusiondirectory.po
+++ b/debconf/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/debconf/locale/cs_CZ/fusiondirectory.po b/debconf/locale/cs_CZ/fusiondirectory.po
index 7f5b7f91dd126bda8bf97beb4118e2f1ec7f9096..425aa238726cdb5fba2f0a18a84b6e912406c62b 100644
--- a/debconf/locale/cs_CZ/fusiondirectory.po
+++ b/debconf/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/debconf/locale/de/fusiondirectory.po b/debconf/locale/de/fusiondirectory.po
index 0954ada896aa9f22837a9fef41dcad3b7d0c9db8..87bd3f28fb2134a89664f5a9a2c481b865c9f3f8 100644
--- a/debconf/locale/de/fusiondirectory.po
+++ b/debconf/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/debconf/locale/el_GR/fusiondirectory.po b/debconf/locale/el_GR/fusiondirectory.po
index 2ab525e5ebcf5e426a65015515e5559f02880b73..9986e4494035a7be8402d2fcf1ab4bd56c45794a 100644
--- a/debconf/locale/el_GR/fusiondirectory.po
+++ b/debconf/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/debconf/locale/en/fusiondirectory.po b/debconf/locale/en/fusiondirectory.po
index 4c5b1e7309e417f7a5309fc75a1f2effaabdc824..19899b2fdecc934f9f6e64d41a03b01d8643f639 100644
--- a/debconf/locale/en/fusiondirectory.po
+++ b/debconf/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/debconf/locale/es/fusiondirectory.po b/debconf/locale/es/fusiondirectory.po
index 5b3815a31932d2f39cb0b1e778d6312e29db8f42..deab280581217f1f1cf11e56fc5cdd316873a371 100644
--- a/debconf/locale/es/fusiondirectory.po
+++ b/debconf/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/debconf/locale/es_CO/fusiondirectory.po b/debconf/locale/es_CO/fusiondirectory.po
index f8eed59698d5fce9f55b138be42fa43ad616c19b..dd849cd7ce28c969fddbe42a55a64766b270ffb8 100644
--- a/debconf/locale/es_CO/fusiondirectory.po
+++ b/debconf/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/debconf/locale/es_VE/fusiondirectory.po b/debconf/locale/es_VE/fusiondirectory.po
index b5895f8dfce5845831e266e97e48deff2a8f87b6..5e34b740b02dfa30cac2188bc914f730c0cc7761 100644
--- a/debconf/locale/es_VE/fusiondirectory.po
+++ b/debconf/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/debconf/locale/fa_IR/fusiondirectory.po b/debconf/locale/fa_IR/fusiondirectory.po
index e4a0bec848de15694a5e3166ddb60b521dbc180c..15ab9cf206c1ce9da341e3994653270d3879cf65 100644
--- a/debconf/locale/fa_IR/fusiondirectory.po
+++ b/debconf/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/debconf/locale/fi_FI/fusiondirectory.po b/debconf/locale/fi_FI/fusiondirectory.po
index 1476a769355667cbb622ede0ed1beb81595410e3..e63ec94a645d5b5a4d1ba6f0e627e404bef0250e 100644
--- a/debconf/locale/fi_FI/fusiondirectory.po
+++ b/debconf/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/debconf/locale/fr/fusiondirectory.po b/debconf/locale/fr/fusiondirectory.po
index ad657bcb98abe7978c3bdbf10ce560c8206db8f6..f6ac2ceb0f61a06e13db17cbd876bbf5b796674a 100644
--- a/debconf/locale/fr/fusiondirectory.po
+++ b/debconf/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,9 +49,9 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 "Afin d'importer un fichier \"debconf\", Merci d'executer la commande "
-"suivante: <br/><i>debconf2ldif.pl -b ou=<b>nom</b>,%s -k <b>nom du "
-"fichier</b> > template.ldif </i><br/>Avec <b>nom du fichier</b> le nom du "
-"fichier debconf, et <b>nom</b> le nom désiré pour le modèle.<br/>"
+"suivante: <br/><i>debconf2ldif.pl -b ou=<b>nom</b>,%s -k <b>fichier</b> > "
+"template.ldif </i><br/>Avec <b>fichier</b> le nom du fichier debconf, et "
+"<b>nom</b> le nom désiré pour le modèle.<br/>"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:168
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:172
@@ -60,7 +60,7 @@ msgstr "Profil Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
-msgstr "Gestion des profils Debconf"
+msgstr "Informations du profil Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:190
@@ -70,11 +70,11 @@ msgstr "Nom"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
-msgstr "Importer un profil Debconf"
+msgstr "Importer un fichier Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
-msgstr "Nom de ce profil Debconf"
+msgstr "Nom de ce modèle Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
@@ -82,7 +82,7 @@ msgstr "Entrées"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
-msgstr "Réponse du modèle Debconf"
+msgstr "Réponses du modèle Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
@@ -99,11 +99,11 @@ msgstr "Gestion des profils Debconf"
 
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
-msgstr "Démarrage du preseed Debconf"
+msgstr "Démarrage par preseed Debconf"
 
 #: admin/systems/debconf/class_debconfStartup.inc:46
 msgid "Debconf settings"
-msgstr "Paramètres de Debconf"
+msgstr "Paramètres Debconf"
 
 #: admin/systems/debconf/class_debconfStartup.inc:49
 msgid "Profile"
@@ -111,7 +111,7 @@ msgstr "Profil"
 
 #: admin/systems/debconf/class_debconfStartup.inc:49
 msgid "Debconf preseed profile to be used for installation"
-msgstr "Profil Debconf du fichier preseed à utiliser pour l'installation"
+msgstr "Profil Debconf preseed à utiliser pour l'installation"
 
 #: admin/systems/debconf/class_debconfStartup.inc:53
 msgid "Release"
@@ -119,7 +119,7 @@ msgstr "Version"
 
 #: admin/systems/debconf/class_debconfStartup.inc:53
 msgid "Debian release to install"
-msgstr "Release Debian à installer"
+msgstr "Version de Debian à installer"
 
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:2
 msgid "Filter"
diff --git a/debconf/locale/hu_HU/fusiondirectory.po b/debconf/locale/hu_HU/fusiondirectory.po
index 14d549c5051bf34bcc91293ffac71c02c6b7894e..7684823ff1ef6d5c2f2a285df6592b2b5237d152 100644
--- a/debconf/locale/hu_HU/fusiondirectory.po
+++ b/debconf/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/debconf/locale/id/fusiondirectory.po b/debconf/locale/id/fusiondirectory.po
index 918a19910774401ef43cdac25f57a9f83a4f5407..b6986da8688938d07d3047d374bac0a871c7fe95 100644
--- a/debconf/locale/id/fusiondirectory.po
+++ b/debconf/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/debconf/locale/it_IT/fusiondirectory.po b/debconf/locale/it_IT/fusiondirectory.po
index 1ad09cf22b038e7f5d7382e796f7b1c01bf4f5c4..ae61a915c4dba6b4a63bc0b0b0c8c42d20f28d9d 100644
--- a/debconf/locale/it_IT/fusiondirectory.po
+++ b/debconf/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/debconf/locale/lv/fusiondirectory.po b/debconf/locale/lv/fusiondirectory.po
index ab89de251910108b82e623ff16185dc791e02b63..077a0b92191b3a06d610d1586e3333739a077b1a 100644
--- a/debconf/locale/lv/fusiondirectory.po
+++ b/debconf/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/debconf/locale/nb/fusiondirectory.po b/debconf/locale/nb/fusiondirectory.po
index d16d8faa7419cb5193594f5bb4efd832be4ebd68..563ad1405107e347f82390953f670a8563b62504 100644
--- a/debconf/locale/nb/fusiondirectory.po
+++ b/debconf/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/debconf/locale/nl/fusiondirectory.po b/debconf/locale/nl/fusiondirectory.po
index c6235745a64367c9876b5deb62717a00ef55d68a..8d766c0695da0ebaa9a3d68f339d80b59a98c265 100644
--- a/debconf/locale/nl/fusiondirectory.po
+++ b/debconf/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/debconf/locale/pl/fusiondirectory.po b/debconf/locale/pl/fusiondirectory.po
index 33ed8e062a01ea87295a109bc407ddbe54abc6b7..4998aa0fbedc707a2da69b268dcc46a1402a2b98 100644
--- a/debconf/locale/pl/fusiondirectory.po
+++ b/debconf/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:85
diff --git a/debconf/locale/pt/fusiondirectory.po b/debconf/locale/pt/fusiondirectory.po
index c81e4b781a1d7db4b8ab40d469df1872c120f687..01d4f256b3c9f3011bedaa8e68d54c15d2c1ed42 100644
--- a/debconf/locale/pt/fusiondirectory.po
+++ b/debconf/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/debconf/locale/pt_BR/fusiondirectory.po b/debconf/locale/pt_BR/fusiondirectory.po
index a401630df61868845357cd7580172fa498da5ea7..71fcd20af035eb98bf150e365880b0686c235640 100644
--- a/debconf/locale/pt_BR/fusiondirectory.po
+++ b/debconf/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/debconf/locale/ru/fusiondirectory.po b/debconf/locale/ru/fusiondirectory.po
index 1b06dc6c67fcebaedcfe86e61f1ef33b6b720b4f..e9a682e240f269088b92231b2d74e9bae61fd3db 100644
--- a/debconf/locale/ru/fusiondirectory.po
+++ b/debconf/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/debconf/locale/ru@petr1708/fusiondirectory.po b/debconf/locale/ru@petr1708/fusiondirectory.po
index 7dc8b5bf500592eb075b28ce133524604458207f..dcf1692198593a5496ea16bea5ee9388aa67b55a 100644
--- a/debconf/locale/ru@petr1708/fusiondirectory.po
+++ b/debconf/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/debconf/locale/sv/fusiondirectory.po b/debconf/locale/sv/fusiondirectory.po
index 058d503370f7558590f8e9115cedcbdd7ad89dc2..6dbb90eca0c45c9b7c9750f730daad87851a4b88 100644
--- a/debconf/locale/sv/fusiondirectory.po
+++ b/debconf/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/debconf/locale/ug/fusiondirectory.po b/debconf/locale/ug/fusiondirectory.po
index ecafed4f35fc1d4285ef922a32f997eaf850bd53..d338cb20a0a97ae9746e5371629348eb47601478 100644
--- a/debconf/locale/ug/fusiondirectory.po
+++ b/debconf/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/debconf/locale/vi_VN/fusiondirectory.po b/debconf/locale/vi_VN/fusiondirectory.po
index b5dddf91ab3355923af40aece1c3f6bde4541012..909038673b9304b20d6f11e383a6c13824ce69d8 100644
--- a/debconf/locale/vi_VN/fusiondirectory.po
+++ b/debconf/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/debconf/locale/zh/fusiondirectory.po b/debconf/locale/zh/fusiondirectory.po
index c3a479536e1b1be7f42c68e65748aaa12592ecdb..cd5b5639e7ba67b4525d3cb576c703fa33dc3c00 100644
--- a/debconf/locale/zh/fusiondirectory.po
+++ b/debconf/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/developers/locale/ar/fusiondirectory.po b/developers/locale/ar/fusiondirectory.po
index 72585a92a8ea045e924c682bd10e4b0ae715c29b..a30096b084b2461711db5ba98a31e89054fd8cc1 100644
--- a/developers/locale/ar/fusiondirectory.po
+++ b/developers/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/ca/fusiondirectory.po b/developers/locale/ca/fusiondirectory.po
index 88ba4c076a37f0047a353e876f80c00bf2ea1a60..bfaf8dbddcf558264cf3064f0076c13b268bcfd1 100644
--- a/developers/locale/ca/fusiondirectory.po
+++ b/developers/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/developers/locale/cs_CZ/fusiondirectory.po b/developers/locale/cs_CZ/fusiondirectory.po
index 26a3bd9cb47fa31a0c81cc05b11549d922328a2f..22fb13e0eedc783243f40acba3df583e3078e210 100644
--- a/developers/locale/cs_CZ/fusiondirectory.po
+++ b/developers/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/developers/locale/de/fusiondirectory.po b/developers/locale/de/fusiondirectory.po
index 0719797186fdfcb0140600f181692b7bd22e0ba7..6e644506ed7aec4f43b24cccc802ea0f05599123 100644
--- a/developers/locale/de/fusiondirectory.po
+++ b/developers/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/developers/locale/el_GR/fusiondirectory.po b/developers/locale/el_GR/fusiondirectory.po
index 4d82df3f99efa012e0a5d1bf5e8d62972ab734e1..7db176c179cb5b5dd7b6694883328c5670cabcbb 100644
--- a/developers/locale/el_GR/fusiondirectory.po
+++ b/developers/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/developers/locale/en/fusiondirectory.po b/developers/locale/en/fusiondirectory.po
index e6cefe9a4960192b3812238393e00bd6732bf221..12c3234ba9e7c1b83b36ac6f2c5072d9577674a0 100644
--- a/developers/locale/en/fusiondirectory.po
+++ b/developers/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/developers/locale/es/fusiondirectory.po b/developers/locale/es/fusiondirectory.po
index 755260bd4d4a32956c13e1e50f98d3e4b1b73c0e..413bc885df41d0ab497c8b37bf2362f535d4c927 100644
--- a/developers/locale/es/fusiondirectory.po
+++ b/developers/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/developers/locale/es_CO/fusiondirectory.po b/developers/locale/es_CO/fusiondirectory.po
index 2ce874ca1c3d9fd4db9f10cb9c235a46d4c1ca10..0743814434f09a29f0a5b0545b29dd21749ae5c8 100644
--- a/developers/locale/es_CO/fusiondirectory.po
+++ b/developers/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/developers/locale/es_VE/fusiondirectory.po b/developers/locale/es_VE/fusiondirectory.po
index 06069aa76c0f732381310fb8044b7829c5a0858f..4186f4a7001f355ba5c368073e56a04575e00684 100644
--- a/developers/locale/es_VE/fusiondirectory.po
+++ b/developers/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/developers/locale/fa_IR/fusiondirectory.po b/developers/locale/fa_IR/fusiondirectory.po
index c9556bd9f969b09c6da7e5aa4621d90e41e440ce..709fffcba89e834f6bb57de012bfa84552f5e423 100644
--- a/developers/locale/fa_IR/fusiondirectory.po
+++ b/developers/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/fi_FI/fusiondirectory.po b/developers/locale/fi_FI/fusiondirectory.po
index ca395a5e411d284c8eaeb1f4200d3e98e7c1f9d4..0812d0f66d87203457280487a31f03bd3ad6cbfd 100644
--- a/developers/locale/fi_FI/fusiondirectory.po
+++ b/developers/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/developers/locale/fr/fusiondirectory.po b/developers/locale/fr/fusiondirectory.po
index 9558fde1a08971e4b3d996de3c1566da8d67ec80..c82855d4ac77f251948807adc2be9c32dd9197ba 100644
--- a/developers/locale/fr/fusiondirectory.po
+++ b/developers/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/developers/locale/hu_HU/fusiondirectory.po b/developers/locale/hu_HU/fusiondirectory.po
index ef25679c8d8f4624916f4b928ec5e5e11cad8156..af41792d78fdfb06d0932f08d9716ad04d5d1f19 100644
--- a/developers/locale/hu_HU/fusiondirectory.po
+++ b/developers/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/id/fusiondirectory.po b/developers/locale/id/fusiondirectory.po
index c7edd47c47791f5a437c94f647414203d0d6e444..37decb6b74fb4118d9ee9eeb85a34ab1f4f9a790 100644
--- a/developers/locale/id/fusiondirectory.po
+++ b/developers/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/it_IT/fusiondirectory.po b/developers/locale/it_IT/fusiondirectory.po
index 925513d76aa7cf2252b8821121e0f2124671422d..aaaaffb65414e3344b164fb946fb80fa9e7a5cc4 100644
--- a/developers/locale/it_IT/fusiondirectory.po
+++ b/developers/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/developers/locale/lv/fusiondirectory.po b/developers/locale/lv/fusiondirectory.po
index 7f57c7fb044946d6c5483b34b1d09173440e0321..9e6da04cf81fdf54b9974237a3043b244f14b076 100644
--- a/developers/locale/lv/fusiondirectory.po
+++ b/developers/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/nb/fusiondirectory.po b/developers/locale/nb/fusiondirectory.po
index 70c82176a5e9bd40b72cb2c97d79ba024e9dcd28..f44572d8358d2750508ccb6d73bc7ddf0cf6153f 100644
--- a/developers/locale/nb/fusiondirectory.po
+++ b/developers/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/developers/locale/nl/fusiondirectory.po b/developers/locale/nl/fusiondirectory.po
index eddd712bc10393da3edc1e4884ed022b6ee6ccb5..529c5e3da15276789cc13c292736455e6a05f180 100644
--- a/developers/locale/nl/fusiondirectory.po
+++ b/developers/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/developers/locale/pl/fusiondirectory.po b/developers/locale/pl/fusiondirectory.po
index 925b31ba9c1eaebe924edd513c73edd888ae8524..81bb903d7318ca9d28d322bad744c8d37937c116 100644
--- a/developers/locale/pl/fusiondirectory.po
+++ b/developers/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
diff --git a/developers/locale/pt/fusiondirectory.po b/developers/locale/pt/fusiondirectory.po
index 3c819dacbf674ed0302ded5260759d2816f0493b..cc01362c213406afc36782b18919c0233fc9910f 100644
--- a/developers/locale/pt/fusiondirectory.po
+++ b/developers/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/developers/locale/pt_BR/fusiondirectory.po b/developers/locale/pt_BR/fusiondirectory.po
index 363c5f132b3bf6c3e762aa71af72bbff342cee75..7df968be537a5d3948692653c1dbf3a364c5e6db 100644
--- a/developers/locale/pt_BR/fusiondirectory.po
+++ b/developers/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/developers/locale/ru/fusiondirectory.po b/developers/locale/ru/fusiondirectory.po
index b5694b32988967586092a90686a1cf2d29a4c214..b8055844bccb292dd5707ea2e7ac72237ea6caa7 100644
--- a/developers/locale/ru/fusiondirectory.po
+++ b/developers/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/developers/locale/ru@petr1708/fusiondirectory.po b/developers/locale/ru@petr1708/fusiondirectory.po
index 78047a3d6d2848acb92737e9f765ce96b0ad056f..719ab834e2902fb5f59225154022d824527f7a4b 100644
--- a/developers/locale/ru@petr1708/fusiondirectory.po
+++ b/developers/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/sv/fusiondirectory.po b/developers/locale/sv/fusiondirectory.po
index b08a2e7fd11529102239bdb7df53b56ac1896f0a..c4a4e86727fdb88836504ebd75eb9f4808efb209 100644
--- a/developers/locale/sv/fusiondirectory.po
+++ b/developers/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/developers/locale/ug/fusiondirectory.po b/developers/locale/ug/fusiondirectory.po
index 53d1591053fd4574d4415261ee6b79042b5e3bbf..6558c9186c852da3fa095db1b184259c1e99d464 100644
--- a/developers/locale/ug/fusiondirectory.po
+++ b/developers/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/vi_VN/fusiondirectory.po b/developers/locale/vi_VN/fusiondirectory.po
index 541362928df9562495292c04e075978a145f2b52..d2fd34500d84c7e76004d6e6dea199ce053add77 100644
--- a/developers/locale/vi_VN/fusiondirectory.po
+++ b/developers/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/developers/locale/zh/fusiondirectory.po b/developers/locale/zh/fusiondirectory.po
index ccb43104c0aa325560bde161da468e51d1a3b220..3039876588ba262d1bdc23e9ea0b1e5d46b77173 100644
--- a/developers/locale/zh/fusiondirectory.po
+++ b/developers/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/dhcp/admin/systems/class_dhcpSystem.inc b/dhcp/admin/systems/class_dhcpSystem.inc
index e0a76bd5dd9b2403b859868437bf52d6e511052d..64126c4bffda708f0eb2cdfe682a00b4952b2c31 100644
--- a/dhcp/admin/systems/class_dhcpSystem.inc
+++ b/dhcp/admin/systems/class_dhcpSystem.inc
@@ -21,6 +21,7 @@
 class DhcpHostsAttribute extends OrderedArrayAttribute
 {
   private $nodesCache = array();
+  private static $templateValueSeparator = '^';
 
   function __construct ($label, $description, $ldapName, array $values = array(), $acl = '')
   {
@@ -64,12 +65,23 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
   {
     parent::setParent($plugin);
     if (is_object($this->plugin)) {
-      if (!$this->plugin->is_template) {
-        $this->loadChoices();
-        $this->loadRecords();
-        $this->plugin->is_account = !empty($this->value);
-      } elseif (isset($this->plugin->attrs[$this->getLdapName()]['count'])) {
+      $this->loadChoices();
+      if ($this->plugin->is_template) {
         $this->value = array();
+        $this->loadAdditionalTemplatesValues();
+      } else {
+        $this->loadRecords();
+      }
+      $this->plugin->is_account = !empty($this->value);
+      $this->plugin->initially_was_account = $this->plugin->is_account;
+    }
+  }
+
+  function loadAdditionalTemplatesValues ()
+  {
+    if (isset($this->plugin->attrs[$this->getLdapName()]['count'])) {
+      for ($i = 0; $i < $this->plugin->attrs[$this->getLdapName()]['count']; $i++) {
+        $this->value[] = explode(static::$templateValueSeparator, $this->plugin->attrs[$this->getLdapName()][$i]);
       }
     }
   }
@@ -92,14 +104,30 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
   function setChoices(array $parentNodes, array $macs, array $ips)
   {
     $this->attribute->attributes[0]->setChoices(array_keys($parentNodes), array_values($parentNodes));
-    $this->attribute->attributes[1]->setChoices($macs);
-    $this->attribute->attributes[2]->setChoices($ips);
+    if (is_object($this->plugin) && $this->plugin->is_template) {
+      $this->attribute->attributes[1] = new StringAttribute(
+        '', _('The Mac address to use in the DHCP host record'),
+        $this->getLdapName().'_mac', TRUE,
+        '%macAddress%'
+      );
+      $this->attribute->attributes[2] = new StringAttribute(
+        '', _('The IP address to use in the DHCP host record'),
+        $this->getLdapName().'_ip', TRUE,
+        '%ipHostNumber%'
+      );
+      $this->attribute->setAttributes($this->attribute->attributes);
+    } else {
+      $this->attribute->attributes[1]->setChoices($macs);
+      $this->attribute->attributes[2]->setChoices($ips);
+    }
   }
 
   function loadRecords()
   {
     global $config;
 
+    $this->value = array();
+
     $ldap = $config->get_ldap_link();
     $ldap->cd($config->current['BASE']);
     $ldap->search('(&(objectClass=dhcpHost)(cn='.$this->plugin->parent->getBaseObject()->cn.')(dhcpHWAddress=*))', array('dhcpStatements','dhcpHWAddress','dn'));
@@ -124,7 +152,7 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
   /* Special LDAP treatment that this attribute does after plugin ldap save */
   function postLdapSave ($ldap, $fullrewrite, $ipchanged, $oldips, $newips, $macchanged, $oldmacs, $newmacs)
   {
-    global $config;
+    global $config, $ui;
 
     if ($this->plugin->is_template) {
       return;
@@ -187,6 +215,7 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
       $errors = $dhcpTabs->save();
       msg_dialog::displayChecks($errors);
     }
+    $errors = array();
     foreach ($values as $value) {
       $configDn = $value[0];
       if (preg_match('/([^,]+,'.preg_quote(get_ou('dhcpRDN')).'.*'.preg_quote($config->current['BASE']).')$/', $value[0], $m)) {
@@ -194,11 +223,22 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
       } else {
         trigger_error('Failed to parse '.$value[0].' to find DHCP configuration DN');
       }
+      /* Check locking */
+      if ($locks = get_locks($configDn)) {
+        $errors[] = sprintf(_('"%s" is locked (by "%s" since %s), could not save modifications to this DHCP configuration'), $locks[0]['object'], $locks[0]['user'], date('%Y-%m-%d, %H:%M:%S', $locks[0]['timestamp']));
+        continue;
+      } else {
+        /* Lock the current entry */
+        add_lock($configDn, $ui->dn);
+      }
       $dhcpTabs = objects::open($configDn, 'dhcpConfiguration');
       $dhcpTabs->getBaseObject()->attributesAccess['dhcpSections']->addHost($value[0], $cn, $value[1], $value[2]);
       $errors = $dhcpTabs->save();
+      del_lock($configDn);
       msg_dialog::displayChecks($errors);
     }
+
+    return $errors;
   }
 
   function check ()
@@ -218,6 +258,13 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
       }
     }
   }
+
+  function fillLdapValue (&$attrs)
+  {
+    if ($this->plugin->is_template) {
+      $attrs[$this->getLdapName()] = array_map(function ($v) {return implode(static::$templateValueSeparator, $v);}, $this->value);
+    }
+  }
 }
 
 class dhcpSystem extends simplePlugin
@@ -271,6 +318,12 @@ class dhcpSystem extends simplePlugin
     return (count($this->dhcpHosts) > 0);
   }
 
+  function setTemplate ($bool)
+  {
+    parent::setTemplate($bool);
+    $this->attributesAccess['dhcpHosts']->setParent($this);
+  }
+
   function save_object()
   {
     parent::save_object();
@@ -323,6 +376,11 @@ class dhcpSystem extends simplePlugin
   {
     global $config;
 
+    $errors = parent::ldap_save();
+    if (!empty($errors)) {
+      return $errors;
+    }
+
     $ldap = $config->get_ldap_link();
     $baseObject = $this->parent->getBaseObject();
     return $this->attributesAccess['dhcpHosts']->postLdapSave(
@@ -347,4 +405,12 @@ class dhcpSystem extends simplePlugin
       return $this->ldap_save();
     }
   }
+
+  function adapt_from_template($attrs, $skip = array())
+  {
+    parent::adapt_from_template($attrs, $skip);
+    $this->attributesAccess['dhcpHosts']->loadChoices();
+    $this->attributesAccess['dhcpHosts']->loadAdditionalTemplatesValues();
+    $this->is_account = $this->is_this_account($this->attrs);
+  }
 }
diff --git a/dhcp/locale/ar/fusiondirectory.po b/dhcp/locale/ar/fusiondirectory.po
index 92d8ec4e44051be519f811e232828f4ec6a0ce79..3e54459b34795f602de8b5b684ba8a4dca9018fe 100644
--- a/dhcp/locale/ar/fusiondirectory.po
+++ b/dhcp/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "الإسم"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "مجموعة"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/ca/fusiondirectory.po b/dhcp/locale/ca/fusiondirectory.po
index e7ddd34abc465354147172c9dfdb03acdb7ae505..6a3eff5d56b4448f08943feabb9f3d90beabd174 100644
--- a/dhcp/locale/ca/fusiondirectory.po
+++ b/dhcp/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Nom"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/cs_CZ/fusiondirectory.po b/dhcp/locale/cs_CZ/fusiondirectory.po
index b0f1446e150fc6fac0de8827d685cf7df826aa39..6d78c3c01f53a8be864b98691bbf062e49848b0e 100644
--- a/dhcp/locale/cs_CZ/fusiondirectory.po
+++ b/dhcp/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr "Nastavení DHCP"
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -88,7 +88,7 @@ msgstr "název"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "globální volby"
 
@@ -103,58 +103,58 @@ msgid ""
 msgstr ""
 "Nastavení DHCP jsou neznámá. Kontaktujte prosím svého správce systémů."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr "DHCP sekce, obsluhovaná tímto serverem"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "pořizování protokolovacích záznamů (logů)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "třída"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr "podtřída"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "stroj"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "skupina"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "rozsah"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "podsíť"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr "záložní server"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "sdílená síť"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr "klíč pro aktualizaci DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "zóny aktualizace DNS"
 
@@ -474,7 +474,7 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Fyzická adresa zařízení (MAC)"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -500,37 +500,46 @@ msgstr "zastavit službu"
 msgid "Restart service"
 msgstr "restartovat službu"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/de/fusiondirectory.po b/dhcp/locale/de/fusiondirectory.po
index 2706c4eebe4c7d006bc42c574e9ef8ee3db8aec9..7a10546d598972929da86bb3ca4611b8f76b3c8a 100644
--- a/dhcp/locale/de/fusiondirectory.po
+++ b/dhcp/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr "DHCP-Konfiguration"
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -88,7 +88,7 @@ msgstr "Name"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "Globale Optionen"
 
@@ -104,58 +104,58 @@ msgstr ""
 "Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren "
 "System-Administrator."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr "DHCP-Objekte"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Protokollierung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "System"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Vorrat"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subnetz"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr "Host für Ausfallsicherung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "Verteiltes Netzwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr "DNS-Update-Schlüssel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "DNS-Update-Zonen"
 
@@ -475,7 +475,7 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Hardware-Adresse"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -501,37 +501,46 @@ msgstr "Dienst stoppen"
 msgid "Restart service"
 msgstr "Dienst neustarten"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr "DHCP-Zonen"
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/el_GR/fusiondirectory.po b/dhcp/locale/el_GR/fusiondirectory.po
index 6b7121e6a4b1f77f6d69dd6ecd9f6a0988782edf..324bd24e3384cf1dcc3e23b0afad16cc093cbc44 100644
--- a/dhcp/locale/el_GR/fusiondirectory.po
+++ b/dhcp/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr "Ρύθμιση DHCP"
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Όνομα"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "Καθολικές επιλογές"
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr "Τα τμήματα του DHCP που διαχειρίζεται αυτός ο διακομιστής."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Καταγραφή"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Class"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr "Subclass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Όνομα συστήματος"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Ομάδα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Ομάδα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Υποδίκτυο"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "Κοινόχρηστο  δίκτυο"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr "Κλειδί ενημέρωσης DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "Ζώνες ενημέρωσης DNS"
 
@@ -473,7 +473,7 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Διεύθυνση υλικού"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr "Τερματισμός υπηρεσίας"
 msgid "Restart service"
 msgstr "Επανεκκίνηση υπηρεσίας"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/en/fusiondirectory.po b/dhcp/locale/en/fusiondirectory.po
index fd56d07cc172e91c9a0a8af88745faf65dc69945..fc2e53a54d6d944132f100a2f9a5d31565de1a69 100644
--- a/dhcp/locale/en/fusiondirectory.po
+++ b/dhcp/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -498,36 +498,45 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/es/fusiondirectory.po b/dhcp/locale/es/fusiondirectory.po
index 5f1fa6427727bc0772b956c76f3821054b6b108c..b9a4926a3edb50a67625eeea612d7f252016eecc 100644
--- a/dhcp/locale/es/fusiondirectory.po
+++ b/dhcp/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr "Configuración DHCP"
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -88,7 +88,7 @@ msgstr "Nombre"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "Opciones globales"
 
@@ -104,58 +104,58 @@ msgstr ""
 "La configuración DHCP es desconocida. Contacte con su administrador de "
 "sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
@@ -475,7 +475,7 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Dirección hardware"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -501,37 +501,46 @@ msgstr "Parar servicio"
 msgid "Restart service"
 msgstr "Reiniciar servicio"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/es_CO/fusiondirectory.po b/dhcp/locale/es_CO/fusiondirectory.po
index 8a33a0b517f9f7b765bff8997f513cdf3c8644dd..988fe00fb2173fa2081fb0dcc99175beed5d1462 100644
--- a/dhcp/locale/es_CO/fusiondirectory.po
+++ b/dhcp/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Nombre"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "GRupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/es_VE/fusiondirectory.po b/dhcp/locale/es_VE/fusiondirectory.po
index dae07d981053c4ba6cc356a00cdc93ace50436f1..bd2e332047a5f854fce2fd024516232ec1dbcc03 100644
--- a/dhcp/locale/es_VE/fusiondirectory.po
+++ b/dhcp/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr "Configuración DHCP"
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -88,7 +88,7 @@ msgstr "Nombre"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "Opciones globales"
 
@@ -104,58 +104,58 @@ msgstr ""
 "La configuración DHCP es desconocida. Contacte con su administrador de "
 "sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
@@ -475,7 +475,7 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Dirección hardware"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -501,37 +501,46 @@ msgstr "Parar servicio"
 msgid "Restart service"
 msgstr "Reiniciar servicio"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/fa_IR/fusiondirectory.po b/dhcp/locale/fa_IR/fusiondirectory.po
index bb87ea0ce9b642d1cadc9f6d2c7e0a191b254d42..749d0a3b7846f26e4ff90e0ee6735f8517b41b62 100644
--- a/dhcp/locale/fa_IR/fusiondirectory.po
+++ b/dhcp/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/fi_FI/fusiondirectory.po b/dhcp/locale/fi_FI/fusiondirectory.po
index 4749d472952ec1cc76314545faf8fef2c4dea436..e2b48479f57c8c7bc24959456afef0e0329277b7 100644
--- a/dhcp/locale/fi_FI/fusiondirectory.po
+++ b/dhcp/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Nimi"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/fr/fusiondirectory.po b/dhcp/locale/fr/fusiondirectory.po
index 0e8527a9f921fa4e2bd343e11394b84d7e9894d1..c8ca86f34d240fa8a933b2dd5eb2f67acb5ce005 100644
--- a/dhcp/locale/fr/fusiondirectory.po
+++ b/dhcp/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr "Configuration DHCP"
 
@@ -39,19 +39,19 @@ msgstr "Branche DHCP"
 
 #: config/dhcp/class_dhcpConfig.inc:44
 msgid "Branch in which DHCP configurations will be stored"
-msgstr "Branches où seront stockées les configurations dhcp"
+msgstr "Branche où seront stockées les configurations DHCP"
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr "DHCP"
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
-msgstr "gestion DHCP"
+msgstr "Gestion DHCP"
 
 #: admin/dhcp/class_dhcpManagement.inc:37
 msgid "Systems"
@@ -59,15 +59,15 @@ msgstr "Systèmes"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
-msgstr "Déplier le sous réseau"
+msgstr "Déplier le sous-réseau DHCP"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
-msgstr "Deplier"
+msgstr "Déplier"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
-msgstr "Replier le sous réseau"
+msgstr "Replier le sous-réseau DHCP"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
@@ -88,7 +88,7 @@ msgstr "Nom"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "Options globales"
 
@@ -104,58 +104,58 @@ msgstr ""
 "La configuration DHCP est inconnue. Veuillez contacter votre administrateur "
 "système."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
-msgstr "Objets dhcp"
+msgstr "Objets DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr "Les sections DHCP gérées par ce serveur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Journaux systèmes"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
-msgstr "Sous classe"
+msgstr "Sous-classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Hôte"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
-msgstr "Groupes"
+msgstr "Groupe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Réservoir"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
-msgstr "Sous réseau"
+msgstr "Sous-réseau"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr "Pair de reprise sur panne"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "Réseau partagé"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
-msgstr "Clef de mise à jour du DNS"
+msgstr "Clé de mise à jour du DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "Zones DNS à mettre à jour"
 
@@ -172,7 +172,7 @@ msgstr "Options"
 
 #: admin/dhcp/class_dhcpPlugin.inc:39
 msgid "The DHCP options"
-msgstr "Options dhcp"
+msgstr "Options DHCP"
 
 #: admin/dhcp/class_dhcpPlugin.inc:47
 msgid "Statements"
@@ -215,27 +215,27 @@ msgstr "Pair de reprise sur panne"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
-msgstr "Serveur Principal"
+msgstr "Serveur primaire"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
-"Adresse IP ou nom DNS du serveur jouant le rôle de principal dans la "
-"configuration Failover et Load Balancing"
+"Adresse IP ou nom DNS du serveur primaire pour la configuration de "
+"répartition de charge et reprise sur panne"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
-msgstr "Port du serveur primaire"
+msgstr "Port primaire"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
-"Port sur lequel le serveur principal écoute les connexions de son homologue "
-"de basculement (serveur secondaire)"
+"Port sur lequel le serveur primaire écoute les connexions de son pair de "
+"basculement (serveur secondaire)"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
@@ -246,20 +246,20 @@ msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
-"Adresse IP ou nom DNS du serveur jouant le rôle de serveur secondaire dans "
-"la configuration Failover et Load Balancing"
+"Adresse IP ou nom DNS du serveur secondaire dans la configuration de "
+"répartition de charge et de reprise sur panne"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
-msgstr "Port du serveur secondaire"
+msgstr "Port secondaire"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
-"Port sur lequel le serveur secondaire écoute les connexions à partir de son "
-"homologue de basculement (serveur primaire)"
+"Port sur lequel le serveur secondaire écoute les connexions de son pair de "
+"basculement (serveur primaire)"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
@@ -275,15 +275,15 @@ msgstr ""
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
-msgstr "Mise a jour sans ACK"
+msgstr "Mise à jour sans ACK"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
-"Nombre de messages BHANDUP que le serveur peut envoyer avant qu'il reçoive "
-"BNDACK de son homologue de basculement"
+"Nombre de messages BNDUP que le serveur peut envoyer avant qu'il reçoive "
+"BNDACK de son pair de basculement"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
@@ -294,7 +294,7 @@ msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
-"Configuration maximale du délai d'exécution du client en secondes, tel que "
+"Configuration du délai maximal d'exécution du client en secondes, tel que "
 "défini dans DHCP Failover Protocol [FAILOVR]"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
@@ -319,12 +319,13 @@ msgstr ""
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
-msgstr ""
+msgstr "Temps de répartition de charge"
 
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
-"Temps de coupure en secondes, après quoi l'équilibre de charge est désactivé"
+"Temps de coupure en secondes, après quoi la répartition de charge est "
+"désactivée"
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:28
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
@@ -337,7 +338,7 @@ msgstr "Serveur DNS de la zone"
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
-msgstr "serveur maître de la zone DNS"
+msgstr "Serveur maître de la zone DNS"
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
@@ -360,7 +361,7 @@ msgstr "Classe DHCP"
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:28
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
 msgid "DHCP DNS update key"
-msgstr "Clef de mise à jour du DNS par dhcp"
+msgstr "Clé de mise à jour du DNS par DHCP"
 
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
@@ -376,7 +377,7 @@ msgstr "Secret"
 
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
-msgstr "Secret pour générer TSIG Key"
+msgstr "Secret pour générer la clé TSIG"
 
 #: admin/dhcp/sections/class_dhcpGroup.inc:28
 #: admin/dhcp/sections/class_dhcpGroup.inc:29
@@ -386,7 +387,7 @@ msgstr "Groupe DHCP"
 #: admin/dhcp/sections/class_dhcpSubnet.inc:28
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "DHCP subnet"
-msgstr "Sous réseau DHCP"
+msgstr "Sous-réseau DHCP"
 
 #: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
@@ -403,7 +404,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpSubnet.inc:48
 #: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
-msgstr "Intervalle"
+msgstr "Plage"
 
 #: admin/dhcp/sections/class_dhcpSubnet.inc:48
 #: admin/dhcp/sections/class_dhcpPool.inc:43
@@ -412,10 +413,9 @@ msgid ""
 "space; if the range only contains one address, then just the address can be "
 "specified. Each range is defined as a separate value."
 msgstr ""
-"Les adresses IP de départ et de fin dans la plage (inclues), séparés par un "
-"espace; si la plage ne contient qu'une seule adresse, alors juste l'adresse "
-"peut être spécifiée sans trait d'union. Chaque plage est définie comme une "
-"valeur distincte."
+"Les adresses IP de départ et de fin (inclues) dans la plage, séparées par un"
+" espace; si la plage ne contient qu'une seule adresse, alors juste l'adresse"
+" peut être entrée. Chaque plage est définie comme une valeur distincte."
 
 #: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
@@ -451,7 +451,7 @@ msgstr "Serveur DHCP secondaire"
 #: admin/dhcp/sections/class_dhcpSubClass.inc:28
 #: admin/dhcp/sections/class_dhcpSubClass.inc:29
 msgid "DHCP subclass"
-msgstr "Sous classe DHCP"
+msgstr "Sous-classe DHCP"
 
 #: admin/dhcp/sections/class_dhcpPool.inc:28
 #: admin/dhcp/sections/class_dhcpPool.inc:29
@@ -478,7 +478,7 @@ msgstr "Hôte DHCP"
 #: admin/dhcp/sections/class_dhcpHost.inc:43
 #: admin/dhcp/sections/class_dhcpHost.inc:52
 msgid "The client hardware address"
-msgstr "Adresse mac du client"
+msgstr "Adresse matérielle du client"
 
 #: admin/dhcp/sections/class_dhcpHost.inc:46
 msgid "The hardware address type"
@@ -500,14 +500,14 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Adresse matérielle"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr "\"%s\" n'est pas une adresse IP valide."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:29
 msgid "DHCP configurations"
-msgstr "Configuration DHCP"
+msgstr "Configurations DHCP"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:34
 msgid ""
@@ -528,38 +528,50 @@ msgstr "Arrêter le Service"
 msgid "Restart service"
 msgstr "Redémarrer le service"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
-"La configuration DHCP ou sous section dans lequel cet hôte doit être ajouté"
+"La configuration DHCP ou sous-section dans laquelle cet hôte doit être "
+"ajouté"
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr "L'adresse Mac à utiliser dans l'enregistrement d'hôte DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr "L'adresse IP à utiliser dans l'enregistrement d'hôte DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+"\"%s\" est verrouillé (par \"%s\" depuis %s), impossible d'enregistrer les "
+"modifications apportées à cette configuration DHCP"
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "La valeur du champ multivalué \"%s\" n'est pas un tableau"
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
-msgstr "Modifier les zones DHCP d'un système"
+msgstr "Éditer les zones DHCP d'un système"
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr "Zones DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
-msgstr "Hôtes dhcp déclarés pour ce système"
+msgstr "Hôtes DHCP déclarés pour ce système"
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
-msgstr "L'ip %s n'est pas dans le réseau %s/%d"
+msgstr "L'IP %s n'est pas dans le réseau %s/%d"
diff --git a/dhcp/locale/hu_HU/fusiondirectory.po b/dhcp/locale/hu_HU/fusiondirectory.po
index ad00ceca0e74a2732894822c37c84f327710942d..c03b4286fd983d388e9d856639464cee57d641a0 100644
--- a/dhcp/locale/hu_HU/fusiondirectory.po
+++ b/dhcp/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Név"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/id/fusiondirectory.po b/dhcp/locale/id/fusiondirectory.po
index fd1cfb47ff6f87a28738882a3c583fa09719357c..6d58d703e4579fbe625378cf951aba7172351b2a 100644
--- a/dhcp/locale/id/fusiondirectory.po
+++ b/dhcp/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -101,58 +101,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -498,37 +498,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/it_IT/fusiondirectory.po b/dhcp/locale/it_IT/fusiondirectory.po
index da3a0ec55538c79edd748691c4b4c587d944423f..81cc5926d49c71794c13ed1254cccdaf0f2d91bd 100644
--- a/dhcp/locale/it_IT/fusiondirectory.po
+++ b/dhcp/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr "Configurazione del DHCP"
 
@@ -45,7 +45,7 @@ msgstr "Ramo in cui le configurazioni DHCP saranno immagazzinate"
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -88,7 +88,7 @@ msgstr "Nome"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "Opzioni globali"
 
@@ -104,58 +104,58 @@ msgstr ""
 "La configurazione DHCP impostata è sconosciuta. Contatta l'amministratore "
 "del sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr "Oggetti DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr "Sezioni DHCP gestite da questo server"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Giornale di sistema"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Categoria"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr "Sottoclasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Deposito"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Sottorete"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr "Partner per la presa di controllo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "Rete condivisa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr "Stile di aggiornamento dinamico del DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "Aggiornamento delle zone DNS"
 
@@ -500,7 +500,7 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Indirizzo hardware"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr "\"%s\" non è un indirizzo IP valido."
@@ -528,37 +528,48 @@ msgstr "Ferma il servizio"
 msgid "Restart service"
 msgstr "Riavvia il servizio"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr "Configurazione o sottosezione DHCP in cui va aggiunto questo host"
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr "Indirizzo MAC da utilizzare nella registrazione dell'host DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr "Indirizzo IP da utilizzare nella registrazione dell'host DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+"\"%s\" è bloccato (da \"%s\" da %s), non é stato possibile salvare le "
+"modifiche di questa configurazione DHCP"
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "Il valore del campo \"%s\" multivalutato non é un array"
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr "Modifica le zone DHCP di un sistema"
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr "Zone DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr "Hosts DHCP dichiarati per questo sistema"
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr "L'ip %s non è nella rete %s/%d"
diff --git a/dhcp/locale/lv/fusiondirectory.po b/dhcp/locale/lv/fusiondirectory.po
index 6cd771628397f0f91da3d51e35f94e54682104b6..536fa8673dab89bc3e8e262344bbafb51824c984 100644
--- a/dhcp/locale/lv/fusiondirectory.po
+++ b/dhcp/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Vārds "
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/nb/fusiondirectory.po b/dhcp/locale/nb/fusiondirectory.po
index 5f22997a25cd13030e452b2e70f14713f780d32f..ab277aea9ad67190f908d92e367182a202ee062b 100644
--- a/dhcp/locale/nb/fusiondirectory.po
+++ b/dhcp/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Navn"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Vert"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/nl/fusiondirectory.po b/dhcp/locale/nl/fusiondirectory.po
index 60e9589b39a4c22568ed35b13b909e18535b4e1a..dc3201dc86ce422043828dd28b174a3c509c7715 100644
--- a/dhcp/locale/nl/fusiondirectory.po
+++ b/dhcp/locale/nl/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Joeri Puttevils <joeri.puttevils@connict.net>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr "DHCP configuratie"
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -88,7 +88,7 @@ msgstr "Naam"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "Globale opties"
 
@@ -104,58 +104,58 @@ msgstr ""
 "De ingestelde DHCP configuratie is onbekend. Neem contact op met uw "
 "systeembeheerder."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr "DHCP objecten"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Loggen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Groep"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subnet"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "Gedeeld netwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr "DNS update sleutel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "DNS update zones"
 
@@ -380,6 +380,8 @@ msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
+"De subnet mask grootte. Het subnet mask kan gemakkelijk bepaald worden van "
+"deze grootte"
 
 #: admin/dhcp/sections/class_dhcpSubnet.inc:48
 #: admin/dhcp/sections/class_dhcpPool.inc:43
@@ -475,7 +477,7 @@ msgstr "Token ring"
 msgid "Hardware address"
 msgstr "Hardware adres"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -501,37 +503,46 @@ msgstr "Stop service"
 msgid "Restart service"
 msgstr "Restart service"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
-msgstr ""
+msgstr "Editeer de DHCP-ranges van een systeem"
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr "DHCP zone"
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/pl/fusiondirectory.po b/dhcp/locale/pl/fusiondirectory.po
index eb00c06cd88b210861a4ddedb663971402cf02f2..53011eae659995f55de9ec7e20e9bb5d14182858 100644
--- a/dhcp/locale/pl/fusiondirectory.po
+++ b/dhcp/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "ImiÄ™"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Klasa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr "Zatrzymaj usługę"
 msgid "Restart service"
 msgstr "Restartuj usługę"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/pt/fusiondirectory.po b/dhcp/locale/pt/fusiondirectory.po
index de6c6c7b19041f2ae5da0fc6c20282a18993764a..b2a2dcbe3c805c5e55d99c7a511a17a6f98ca809 100644
--- a/dhcp/locale/pt/fusiondirectory.po
+++ b/dhcp/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Nome"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/pt_BR/fusiondirectory.po b/dhcp/locale/pt_BR/fusiondirectory.po
index aab1b52651d94a10995e4850ee5948f471e5c5f1..5a7de02a165a5deb3a10e90256f88bb7b43bc5bf 100644
--- a/dhcp/locale/pt_BR/fusiondirectory.po
+++ b/dhcp/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Nome"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -104,58 +104,58 @@ msgstr ""
 "A configuração de DHCP é desconhecida. Por favor, contacte seu administrador"
 " do sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Logando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -475,7 +475,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -501,37 +501,46 @@ msgstr "Parar serviço"
 msgid "Restart service"
 msgstr "Reiniciar serviço"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/ru/fusiondirectory.po b/dhcp/locale/ru/fusiondirectory.po
index 093e939e8e667047e980451a500d88bc02edf77a..43af20ce81d56670b5fd0b817f766940de31b020 100644
--- a/dhcp/locale/ru/fusiondirectory.po
+++ b/dhcp/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -88,7 +88,7 @@ msgstr "Фамилия"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Класс"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Хост"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Группа"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr "Остановить службу"
 msgid "Restart service"
 msgstr "Перезапустить службу"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/ru@petr1708/fusiondirectory.po b/dhcp/locale/ru@petr1708/fusiondirectory.po
index 8418ac76237ea09a161ce8d61cc75e730d70c875..4a125526b274b1c316dbe93ffe31da91688c1c81 100644
--- a/dhcp/locale/ru@petr1708/fusiondirectory.po
+++ b/dhcp/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -101,58 +101,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -498,37 +498,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/sv/fusiondirectory.po b/dhcp/locale/sv/fusiondirectory.po
index d8d5f88f480faca8716dde3b23310d471dcd1dd7..5c554b5a1b1f632d96309dcabb9c83684098e7a3 100644
--- a/dhcp/locale/sv/fusiondirectory.po
+++ b/dhcp/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Namn"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr "Globala inställningar"
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr "DHCP-konfigurationen är okänd. Kontakta systemadministratören"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr "Loggning"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "Klass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr "Subklass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Grupp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subnät"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr "Delat nätverk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr "DNS-uppdateringsnyckel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr "DNS-uppdateringszoner"
 
@@ -473,7 +473,7 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "HÃ¥rdvaruadress"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr "Stoppa tjänsten"
 msgid "Restart service"
 msgstr "Starta om tjänsten"
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/ug/fusiondirectory.po b/dhcp/locale/ug/fusiondirectory.po
index 9fffa4daca4b19c5b10032773de856896cd97e29..f61b5fc10a37202c962dadf54febb91e9e9db980 100644
--- a/dhcp/locale/ug/fusiondirectory.po
+++ b/dhcp/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -101,58 +101,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -498,37 +498,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/vi_VN/fusiondirectory.po b/dhcp/locale/vi_VN/fusiondirectory.po
index 49ecd069f79dd1cb5da853919573499adf6e7ccb..7849f2d83433a0abe91d196a8231d3ac01674acc 100644
--- a/dhcp/locale/vi_VN/fusiondirectory.po
+++ b/dhcp/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "Tên"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "Nhóm "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dhcp/locale/zh/fusiondirectory.po b/dhcp/locale/zh/fusiondirectory.po
index b868ab4968100d44e3da0dce780cc416ac7ec9c5..5a93b3b3a25d2606d96fc50825802bb2d236cef7 100644
--- a/dhcp/locale/zh/fusiondirectory.po
+++ b/dhcp/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:531
 #: admin/dhcp/class_dhcpConfiguration.inc:532
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:39
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
-#: admin/systems/class_dhcpSystem.inc:233
+#: admin/systems/class_dhcpSystem.inc:280
 msgid "DHCP"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr "名称"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:366
 #: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:575
+#: admin/dhcp/class_dhcpConfiguration.inc:576
 msgid "Global options"
 msgstr ""
 
@@ -102,58 +102,58 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:553
+#: admin/dhcp/class_dhcpConfiguration.inc:554
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:574
+#: admin/dhcp/class_dhcpConfiguration.inc:575
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:576
+#: admin/dhcp/class_dhcpConfiguration.inc:577
 msgid "Class"
 msgstr "ç±»"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:577
+#: admin/dhcp/class_dhcpConfiguration.inc:578
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:578
+#: admin/dhcp/class_dhcpConfiguration.inc:579
 #: admin/dhcp/sections/class_dhcpHost.inc:40
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/class_dhcpConfiguration.inc:580
 msgid "Group"
 msgstr "组"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:580
+#: admin/dhcp/class_dhcpConfiguration.inc:581
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/class_dhcpConfiguration.inc:582
 #: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/class_dhcpConfiguration.inc:583
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:583
+#: admin/dhcp/class_dhcpConfiguration.inc:584
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:584
+#: admin/dhcp/class_dhcpConfiguration.inc:585
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:585
+#: admin/dhcp/class_dhcpConfiguration.inc:586
 msgid "DNS update zones"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:85
+#: admin/dhcp/sections/class_dhcpHost.inc:90
 #, php-format
 msgid "\"%s\" is not a valid IP address."
 msgstr ""
@@ -499,37 +499,46 @@ msgstr ""
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:31
+#: admin/systems/class_dhcpSystem.inc:32
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:35
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
 msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:39
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:211
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:281
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:248
+#: admin/systems/class_dhcpSystem.inc:295
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:252
+#: admin/systems/class_dhcpSystem.inc:299
 msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:310
+#: admin/systems/class_dhcpSystem.inc:363
 #, php-format
 msgid "The ip %s is not in the network %s/%d"
 msgstr ""
diff --git a/dns/admin/dns/class_DnsRecordAttribute.inc b/dns/admin/dns/class_DnsRecordAttribute.inc
index 3ba3bac6bde41c5c0cb702b367db2b895cee9c49..7afa4ea4de15143020180713a18ef97016ab09e9 100644
--- a/dns/admin/dns/class_DnsRecordAttribute.inc
+++ b/dns/admin/dns/class_DnsRecordAttribute.inc
@@ -426,23 +426,29 @@ class DnsRecordAttribute extends CompositeAttribute
     if (in_array($type, static::$reverseTypes) && ($this->attributes[2]->getValue() != '')) {
       $ip       = $this->attributes[1]->getValue();
       $reverse  = $this->attributes[2]->getValue();
-      $mask     = preg_replace('/\.(in-addr|ip6)\.arpa\.?$/i', '', $reverse);
-      if (preg_match('/^([[:digit:]]+[-\/][[:digit:]]+).([\.[:digit:]]+)$/', $mask, $m)) {
-        /* Reverse zone using rfc2317 with - or / */
-        $mask = $m[2];
-      }
-      if ($type == 'aRecord') {
-        $testString = implode('.', array_reverse(explode('.', $ip)));
-      } elseif ($type == 'aAAARecord') {
-        $testString = implode('.', array_reverse(preg_split('/:|/', expandIPv6($ip), NULL, PREG_SPLIT_NO_EMPTY)));
-      }
 
-      if (!preg_match('/\.'.preg_quote($mask).'$/', $testString)) {
+      if (!static::matchReverseZone($type, $ip, $reverse)) {
         return _('The entered IP does not match the selected reverse zone');
       }
     }
   }
 
+  static function matchReverseZone($type, $ip, $reverse)
+  {
+    $mask = preg_replace('/\.(in-addr|ip6)\.arpa\.?$/i', '', $reverse);
+    if (preg_match('/^([[:digit:]]+[-\/][[:digit:]]+).([\.[:digit:]]+)$/', $mask, $m)) {
+      /* Reverse zone using rfc2317 with - or / */
+      $mask = $m[2];
+    }
+    if ($type == 'aRecord') {
+      $testString = implode('.', array_reverse(explode('.', $ip)));
+    } elseif ($type == 'aAAARecord') {
+      $testString = implode('.', array_reverse(preg_split('/:|/', expandIPv6($ip), NULL, PREG_SPLIT_NO_EMPTY)));
+    }
+
+    return preg_match('/\.'.preg_quote($mask).'$/', $testString);
+  }
+
   function getAcl ()
   {
     return $this->getHtmlId().'_'.$this->attributes[0]->getValue();
diff --git a/dns/admin/dns/class_dnsManagement.inc b/dns/admin/dns/class_dnsManagement.inc
index ab4b2d7306586f85a05a65239361f4ebe24e997c..dc9357cccc1dd8016fbd991c2cb560c7d20d0c0f 100644
--- a/dns/admin/dns/class_dnsManagement.inc
+++ b/dns/admin/dns/class_dnsManagement.inc
@@ -86,9 +86,7 @@ class dnsManagement extends simpleManagement
     foreach ($targets as $zoneDn) {
       $entry = $this->getHeadpage()->getEntry($zoneDn);
       list ($fqdn) = explode(' ', $entry['sOARecord'][0]);
-      $zoneName = $entry['zoneName'][0];
-      $serverCn = preg_replace('/\.'.preg_quote($zoneName, '/').'$/', '', $fqdn);
-      $servers = objects::ls('server', array('cn' => 1, 'macAddress' => 1), NULL, '(&(cn='.ldap_escape_f($serverCn).')(fdDNSZoneDn='.ldap_escape_f($zoneDn).'))');
+      $servers = static::findServerByFQDN($fqdn, $zoneDn);
       if (count($servers) > 1) {
         msg_dialog::display(_('Could not run ldap2zone'), _('More than one server matches the SOA'), ERROR_DIALOG);
       } elseif (count($servers) == 0) {
@@ -101,7 +99,8 @@ class dnsManagement extends simpleManagement
             msg_dialog::display(_('Could not run ldap2zone'), msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
             );
           } else {
-            $target = array($serverTabs->getBaseObject()->macAddress);
+            $target   = array($serverTabs->getBaseObject()->macAddress);
+            $zoneName = $entry['zoneName'][0];
             $s_daemon->append_call('Ldap2Zone.start', $target, array('args' => array($zoneName)));
             if ($s_daemon->is_error()) {
               msg_dialog::display(_('Could not get run ldap2zone'), msgPool::siError($s_daemon->get_error()), ERROR_DIALOG);
@@ -115,5 +114,33 @@ class dnsManagement extends simpleManagement
       }
     }
   }
+
+  public static function findServerByFQDN($fqdn, $zoneDn = NULL)
+  {
+    global $config;
+    list ($serverCn, $serverZone) = explode('.', $fqdn, 2);
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ips = array();
+    $ldap->search('(&(|(aRecord=*)(aAAARecord=*))(relativeDomainName='.$serverCn.')(zoneName='.$serverZone.'))', array('aRecord', 'aAAARecord'));
+    while ($attrs = $ldap->fetch()) {
+      if (isset($attrs['aRecord'])) {
+        unset($attrs['aRecord']['count']);
+        $ips = array_merge($ips, $attrs['aRecord']);
+      }
+      if (isset($attrs['aAAARecord'])) {
+        unset($attrs['aAAARecord']['count']);
+        $ips = array_merge($ips, $attrs['aAAARecord']);
+      }
+    }
+    if (!empty($ips)) {
+      $filter = '(|(ipHostNumber='.implode(')(ipHostNumber=', $ips).'))';
+      if ($zoneDn !== NULL) {
+        $filter = '(&'.$filter.'(fdDNSZoneDn='.ldap_escape_f($zoneDn).'))';
+      }
+      return objects::ls('server', NULL, NULL, $filter);
+    }
+    return array();
+  }
 }
 ?>
diff --git a/dns/admin/dns/class_dnsView.inc b/dns/admin/dns/class_dnsView.inc
index 4488857b08bfefc8a0e3648b15db0e3bf2d7234c..485415a15bd5f29a6542f3e17427592385a5a7de 100644
--- a/dns/admin/dns/class_dnsView.inc
+++ b/dns/admin/dns/class_dnsView.inc
@@ -54,7 +54,7 @@ class dnsView extends simplePlugin
             'fdDNSViewMatchClientsAcl', FALSE
           ),
           new SelectAttribute (
-            _('Match destinations ACL'), _('Name of the ACL to use for the source IP address of the incoming requests'),
+            _('Match destinations ACL'), _('Name of the ACL to use for the destination IP address of the incoming requests'),
             'fdDNSViewMatchDestinationsAcl', FALSE
           ),
           new BooleanAttribute (
diff --git a/dns/admin/dns/class_dnsZone.inc b/dns/admin/dns/class_dnsZone.inc
index a4e02efddec748a6d7ca550a9d1560c7f438c9bc..03c4431ebb9c75b18d66cd87661ba26c725f02b0 100644
--- a/dns/admin/dns/class_dnsZone.inc
+++ b/dns/admin/dns/class_dnsZone.inc
@@ -215,6 +215,29 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
     );
   }
 
+  protected function loadReverseZones ($attrs)
+  {
+    global $config;
+
+    /* Get reverse zones */
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($attrs['dn']);
+    $ldap->search('(&(objectClass=dNSZone)(relativeDomainName=@)(zoneName=*))', array('zoneName'), 'one');
+    $reverseZones = array();
+    while ($subattrs = $ldap->fetch()) {
+      $reverseZones[$subattrs['dn']] = $subattrs['zoneName'][0];
+    }
+    if ($this->plugin instanceof dnsZone) {
+      $this->plugin->reverseZones = array_values($reverseZones);
+      $this->plugin->attributesAccess['reverseZones']->setInitialValue($this->plugin->reverseZones);
+    } else {
+      $this->reverseZones = array_values($reverseZones);
+      $this->sOARecord    = $attrs['sOARecord'][0];
+    }
+
+    return $reverseZones;
+  }
+
   protected function loadAttrValue ($attrs)
   {
     global $config;
@@ -262,20 +285,8 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
           }
         }
       }
-      /* Get reverse zone */
-      $ldap->cd($attrs['dn']);
-      $ldap->search('(&(objectClass=dNSZone)(relativeDomainName=@)(zoneName=*))', array('zoneName'), 'one');
-      $reverseZones = array();
-      while ($subattrs = $ldap->fetch()) {
-        $reverseZones[$subattrs['dn']] = $subattrs['zoneName'][0];
-      }
-      if ($this->plugin instanceof dnsZone) {
-        $this->plugin->reverseZones = array_values($reverseZones);
-        $this->plugin->attributesAccess['reverseZones']->setInitialValue($this->plugin->reverseZones);
-      } else {
-        $this->reverseZones = array_values($reverseZones);
-        $this->sOARecord    = $attrs['sOARecord'][0];
-      }
+      $reverseZones = $this->loadReverseZones($attrs);
+      /* Search reverse zones for our IPs */
       foreach ($reverseZones as $reverseZoneDn => $reverseZoneName) {
         $ipv6 = preg_match('/ip6/', $reverseZoneName);
         $baseIp = preg_replace('/\.(in-addr|ip6)\.arpa\.?$/i', '', $reverseZoneName);
@@ -356,13 +367,21 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
     foreach ($this->value as $line) {
       list ($domain, $type, $content, $reverse) = $line;
       if (!empty($reverse)) {
-        if (!isset($ptrs[$reverse])) {
-          $ptrs[$reverse] = array();
-        }
-        if (!isset($ptrs[$reverse][$content])) {
-          $ptrs[$reverse][$content] = array();
+        if (!DnsRecordAttribute::matchReverseZone($type, $content, $reverse)) {
+          msg_dialog::display(
+            _('Error'),
+            sprintf(_('The IP %s does not match the selected reverse %s, it has been ignored'), $content, $reverse),
+            ERROR_DIALOG
+          );
+        } else {
+          if (!isset($ptrs[$reverse])) {
+            $ptrs[$reverse] = array();
+          }
+          if (!isset($ptrs[$reverse][$content])) {
+            $ptrs[$reverse][$content] = array();
+          }
+          $ptrs[$reverse][$content][] = $domain;
         }
-        $ptrs[$reverse][$content][] = $domain;
       }
       if (empty($domain)) {
         if ($type == 'nSRecord') {
@@ -481,6 +500,18 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
     return $nb;
   }
 
+  function cnRemoved($oldcn)
+  {
+    $nb = 0;
+    foreach ($this->value as $key => $row) {
+      if ($row[0] == $oldcn) {
+        unset($this->value[$key]);
+        $nb++;
+      }
+    }
+    return $nb;
+  }
+
   function ipRemoved($oldips)
   {
     $nb = 0;
@@ -727,6 +758,15 @@ class dnsZone extends simplePlugin
     return $nb;
   }
 
+  function cnRemoved ($oldcn)
+  {
+    $nb = $this->attributesAccess['dnsRecords']->cnRemoved($oldcn);
+    if ($nb > 0) {
+      $this->save();
+    }
+    return $nb;
+  }
+
   function ipRemoved ($oldips)
   {
     $nb = $this->attributesAccess['dnsRecords']->ipRemoved($oldips);
diff --git a/dns/admin/systems/class_dnsHost.inc b/dns/admin/systems/class_dnsHost.inc
index 3ebde31f10b69ca083ed567d71a8edf356f86d48..42f57b6e31626e5f242dbcee2a26dfacb4e9f40e 100644
--- a/dns/admin/systems/class_dnsHost.inc
+++ b/dns/admin/systems/class_dnsHost.inc
@@ -21,6 +21,8 @@
 /* DnsRecords edition showing only records for our host */
 class DnsRecordsFilteredAttribute extends DnsRecordsAttribute
 {
+  private static $templateValueSeparator = '^';
+
   function __construct ($label, $description, $ldapName, $zoneDn, $defaultValue = array(), $acl = "")
   {
     parent::__construct ($label, $description, $ldapName, FALSE, $defaultValue, $acl);
@@ -37,7 +39,7 @@ class DnsRecordsFilteredAttribute extends DnsRecordsAttribute
     if (is_object($this->plugin)) {
       if (!$this->plugin->is_template) {
         $this->loadRecords();
-      } elseif (isset($this->plugin->attrs[$this->getLdapName()]['count'])) {
+      } else {
         $this->value = array();
         $this->loadAdditionalTemplatesValues();
       }
@@ -52,9 +54,12 @@ class DnsRecordsFilteredAttribute extends DnsRecordsAttribute
     $ldap->cat($this->getZoneDn());
     $attrs = $ldap->fetch();
     $this->zoneName = $attrs['zoneName'][0];
+    $this->loadReverseZones($attrs);
 
-    for ($i = 0; $i < $this->plugin->attrs[$this->getLdapName()]['count']; $i++) {
-      $this->value[] = explode('|', $this->plugin->attrs[$this->getLdapName()][$i]);
+    if (isset($this->plugin->attrs[$this->getLdapName()]['count'])) {
+      for ($i = 0; $i < $this->plugin->attrs[$this->getLdapName()]['count']; $i++) {
+        $this->value[] = explode(static::$templateValueSeparator, $this->plugin->attrs[$this->getLdapName()][$i]);
+      }
     }
   }
 
@@ -88,7 +93,7 @@ class DnsRecordsFilteredAttribute extends DnsRecordsAttribute
   function fillLdapValue (&$attrs)
   {
     if ($this->plugin->is_template) {
-      $attrs[$this->getLdapName()] = array_map(function ($v) {return implode('|', $v);}, $this->value);
+      $attrs[$this->getLdapName()] = array_map(function ($v) {return implode(static::$templateValueSeparator, $v);}, $this->value);
     }
   }
 
@@ -159,6 +164,11 @@ class dnsHost extends simplePlugin
   {
     global $config;
     parent::__construct($dn, $object, $parent, $mainTab);
+    $this->reloadZoneChoices();
+  }
+
+  protected function reloadZoneChoices()
+  {
     /* List DNS zones we can read */
     $this->zonesCache = objects::ls('dnsZone', NULL, NULL, '', TRUE);
     /* Check if some values are missing */
@@ -242,7 +252,8 @@ class dnsHost extends simplePlugin
         $ldap->cat($dn);
         if ($attrs = $ldap->fetch()) {
           list ($fqdn) = explode(' ', $attrs['sOARecord'][0]);
-          if ($fqdn == $cn.'.'.$attrs['zoneName'][0]) {
+          $servers = dnsManagement::findServerByFQDN($fqdn, $dn);
+          if (isset($servers[$this->dn])) {
             $fqdn = '<strong>'.$fqdn.'</strong>';
             if (class_available('supportDaemon')) {
               $id = 'ldap2zone_refresh_'.base64_encode($attrs['zoneName'][0]);
@@ -325,8 +336,23 @@ class dnsHost extends simplePlugin
     /* Update records if IP or CN changed */
     if ($this->initially_was_account) {
       $baseObject = $this->parent->getBaseObject();
-      $message    = '';
+      $messages   = array();
       $oldcn      = preg_replace('/\$$/', '', $baseObject->attributeInitialValue('cn'));
+      $oldips     = $baseObject->attributeInitialValue('ipHostNumber');
+
+      $oldzones = $this->attributeInitialValue('fdDNSZoneDn');
+      $newzones = $this->attributeValue('fdDNSZoneDn');
+      if ($this->attributeHaveChanged('fdDNSZoneDn') && !empty($oldzones)) {
+        $messages = array_merge(
+          $messages,
+          static::removeIpsFromZones(array_diff($oldzones, $newzones), $oldips)
+        );
+        $messages = array_merge(
+          $messages,
+          static::removeCnFromZones(array_diff($oldzones, $newzones), $oldcn)
+        );
+      }
+
       if ($baseObject->attributeHaveChanged('cn') && !empty($oldcn)) {
         $newcn      = preg_replace('/\$$/', '', $baseObject->attributeValue('cn'));
         $dnsZones   = $this->fdDNSZoneDn;
@@ -334,8 +360,8 @@ class dnsHost extends simplePlugin
           $tabObject = objects::open($dn, 'dnsZone');
           $nbRecords = $tabObject->getBaseObject()->cnChanged($oldcn, $newcn);
           if ($nbRecords > 0) {
-            $message .= sprintf(
-              _('%d records were updated from %s to %s in zone %s')."<br/>\n",
+            $messages[] = sprintf(
+              _('%d records were updated from %s to %s in zone %s'),
               $nbRecords,
               $oldcn,
               $newcn,
@@ -346,7 +372,6 @@ class dnsHost extends simplePlugin
       }
 
       if ($baseObject->attributeHaveChanged('ipHostNumber')) {
-        $oldips = $baseObject->attributeInitialValue('ipHostNumber');
         $newips = $baseObject->attributeValue('ipHostNumber');
         if ((count($oldips) == 1) && (count($newips) == 1)) {
           $dnsZones   = $this->fdDNSZoneDn;
@@ -354,8 +379,8 @@ class dnsHost extends simplePlugin
             $tabObject = objects::open($dn, 'dnsZone');
             $nbRecords = $tabObject->getBaseObject()->ipChanged(reset($oldips), reset($newips));
             if ($nbRecords > 0) {
-              $message .= sprintf(
-                _('%d records were updated from %s to %s in zone %s')."<br/>\n",
+              $messages[] = sprintf(
+                _('%d records were updated from %s to %s in zone %s'),
                 $nbRecords,
                 reset($oldips),
                 reset($newips),
@@ -363,32 +388,50 @@ class dnsHost extends simplePlugin
               );
             }
           }
-        } else {
-          $dnsZones   = $this->fdDNSZoneDn;
-          foreach ($dnsZones as $dn) {
-            $tabObject = objects::open($dn, 'dnsZone');
-            $nbRecords = $tabObject->getBaseObject()->ipRemoved(array_diff($oldips, $newips));
-            if ($nbRecords > 0) {
-              $message .= sprintf(
-                _('%d records were removed in zone %s')."<br/>\n",
-                $nbRecords,
-                $tabObject->getBaseObject()->zoneName
-              );
-            }
-          }
+        } elseif (!empty($oldips)) {
+          static::removeIpsFromZone($this->fdDNSZoneDn, array_diff($oldips, $newips));
         }
       }
-      if (!empty($message)) {
-        msg_dialog::display(_('DNS update'), $message, INFO_DIALOG);
+      if (!empty($messages)) {
+        msg_dialog::display(_('DNS update'), implode("<br/>\n", $messages)."<br/>\n", INFO_DIALOG);
       }
     }
 
     return $errors;
   }
 
+  protected function post_remove ()
+  {
+    /* Remove records of our IP or CN */
+    if ($this->initially_was_account) {
+      $baseObject = $this->parent->getBaseObject();
+      $messages   = array();
+      $oldcn      = preg_replace('/\$$/', '', $baseObject->attributeInitialValue('cn'));
+      $oldips     = $baseObject->attributeInitialValue('ipHostNumber');
+
+      $oldzones = $this->attributeInitialValue('fdDNSZoneDn');
+      if (!empty($oldzones)) {
+        $messages = array_merge(
+          $messages,
+          static::removeIpsFromZones($oldzones, $oldips)
+        );
+        $messages = array_merge(
+          $messages,
+          static::removeCnFromZones($oldzones, $oldcn)
+        );
+      }
+    }
+    if (!empty($messages)) {
+      msg_dialog::display(_('DNS update'), implode("<br/>\n", $messages)."<br/>\n", INFO_DIALOG);
+    }
+
+    return parent::post_remove();
+  }
+
   function adapt_from_template($attrs, $skip = array())
   {
     parent::adapt_from_template($attrs, $skip);
+    $this->reloadZoneChoices();
     $this->zoneChanged();
     if (isset($this->attributesInfo['records'])) {
       foreach ($this->attributesInfo['records']['attrs'] as &$attr) {
@@ -403,7 +446,6 @@ class dnsHost extends simplePlugin
   function addRecord($zoneDn, array $record)
   {
     if (isset($this->zonesCache[$zoneDn])) {
-      $name   = $this->zonesCache[$zoneDn];
       $zoneid = preg_replace('/[\/\-,.#:; =]/', '_', $zoneDn);
     } else {
       return FALSE;
@@ -411,4 +453,38 @@ class dnsHost extends simplePlugin
     $attrId = 'zoneRecords'.$zoneid;
     $this->attributesAccess[$attrId]->addValue($record);
   }
+
+  static function removeIpsFromZones(array $zoneDns, array $ips)
+  {
+    $messages = array();
+    foreach ($zoneDns as $zoneDn) {
+      $tabObject = objects::open($zoneDn, 'dnsZone');
+      $nbRecords = $tabObject->getBaseObject()->ipRemoved($ips);
+      if ($nbRecords > 0) {
+        $messages[] = sprintf(
+          _('%d records were removed in zone %s'),
+          $nbRecords,
+          $tabObject->getBaseObject()->zoneName
+        );
+      }
+    }
+    return $messages;
+  }
+
+  static function removeCnFromZones(array $zoneDns, $cn)
+  {
+    $messages = array();
+    foreach ($zoneDns as $zoneDn) {
+      $tabObject = objects::open($zoneDn, 'dnsZone');
+      $nbRecords = $tabObject->getBaseObject()->cnRemoved($cn);
+      if ($nbRecords > 0) {
+        $messages[] = sprintf(
+          _('%d records were removed in zone %s'),
+          $nbRecords,
+          $tabObject->getBaseObject()->zoneName
+        );
+      }
+    }
+    return $messages;
+  }
 }
diff --git a/dns/locale/ar/fusiondirectory.po b/dns/locale/ar/fusiondirectory.po
index 9096a94af48c2c9d6a993b9ce8e026f04609cbb0..ae5aa5121032dee2f4ef6daf6442ab9a71495bac 100644
--- a/dns/locale/ar/fusiondirectory.po
+++ b/dns/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "أنظمة"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "خطأ"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/ca/fusiondirectory.po b/dns/locale/ca/fusiondirectory.po
index 5fe52271e27f9f0d6c57bd7b53cca68233564bbd..8634f503ec48cd2cf7d3059e503cb3359889a424 100644
--- a/dns/locale/ca/fusiondirectory.po
+++ b/dns/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Error"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Adreça de correu"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/cs_CZ/fusiondirectory.po b/dns/locale/cs_CZ/fusiondirectory.po
index 0815043ef1672ef9785161f474caf6115c36e37f..20dffab75d2f75ec143a15021c8d9c87ae5a2f33 100644
--- a/dns/locale/cs_CZ/fusiondirectory.po
+++ b/dns/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr "DNS zóny"
 
@@ -117,7 +123,7 @@ msgstr "DNS zóny"
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +135,39 @@ msgstr "Správa DNS"
 msgid "Systems"
 msgstr "systémy"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "chyba"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr "obsah"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "chyba LDAPu"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "DNS zóna"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Zóna"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "název zóny"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "SOA záznam"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr "Hlavní DNS server"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "e-mailová adresa"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr "Sériové číslo"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "obnovit"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "znovu"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "vyprší"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr "Hlavní servery"
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/de/fusiondirectory.po b/dns/locale/de/fusiondirectory.po
index 18222c5d187625ee95e02f8ba24e69dd9dd7ef24..f9c310a64497e15fd9f28fa6721eb68dd889583d 100644
--- a/dns/locale/de/fusiondirectory.po
+++ b/dns/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -92,7 +92,7 @@ msgstr "Name dieser Ansicht"
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr "DNS-Zonen"
 
@@ -117,7 +123,7 @@ msgstr "DNS-Zonen"
 msgid "DNS zones in this view"
 msgstr "DNS-Zonen in dieser Ansicht"
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +135,39 @@ msgstr "DNS-Verwaltung"
 msgid "Systems"
 msgstr "Systeme"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr "Inhalt"
 msgid "Content of this record"
 msgstr "Inhalt dieses Eintrags"
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr "DNS-Eintrag"
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "DNS-Zone"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Zonenname"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "SOA-Eintrag"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr "SOA-Eintrag"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr "Primärer DNS-Server"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr "Seriennummer"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Ablauf"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr "Einträge"
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr "SOA-Einträge"
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr "DNS-Einträge"
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr "Primäre Server"
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr "Die DNS-Einträge für Zone \"%s\""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr "Der primäre Server für Zone \"%s\""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/el_GR/fusiondirectory.po b/dns/locale/el_GR/fusiondirectory.po
index 126aa9676d3af043184d4c7dd92fa962336b0e7a..52d0554818058dc9902f5906d38bb66312c209a7 100644
--- a/dns/locale/el_GR/fusiondirectory.po
+++ b/dns/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr "Ζώνες DNS"
 
@@ -117,7 +123,7 @@ msgstr "Ζώνες DNS"
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "Systems"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr "Περιεχόμενο"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "Ζώνη DNS"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Όνομα ζώνης"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "Εγγραφή SOA "
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Διεύθυνση αλληλογραφίας"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Προσπάθεια ξανά"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Λήξη"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/en/fusiondirectory.po b/dns/locale/en/fusiondirectory.po
index 100dcc07d0e4e83c31db2b29baffd40e9e7fd414..d0cd2c846ca00019bbf69315a2eb56834a716ed1 100644
--- a/dns/locale/en/fusiondirectory.po
+++ b/dns/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -100,6 +100,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -108,7 +114,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +122,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +134,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -419,7 +426,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -448,169 +455,174 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final dot.<br/"
 "><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or x.x.ip6."
 "arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/es/fusiondirectory.po b/dns/locale/es/fusiondirectory.po
index 6122ffdb202f3e026366afbc01bb27bf6cbe852e..b408d458a2c533fa82a33960bfe2f9dbf64d5be5 100644
--- a/dns/locale/es/fusiondirectory.po
+++ b/dns/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Error"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr "Contenido"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "Zona DNS"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Zona"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "Registro SOA"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Refresco"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Reintento"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Expiración"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/es_CO/fusiondirectory.po b/dns/locale/es_CO/fusiondirectory.po
index cbc354d3599bc285de71bd52c4dab77a9cf172df..2a7f4f3f790449dfe2a1748fe78b8f3c99329921 100644
--- a/dns/locale/es_CO/fusiondirectory.po
+++ b/dns/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Error"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/es_VE/fusiondirectory.po b/dns/locale/es_VE/fusiondirectory.po
index 2ed5a10892a17231d9ab333ecc03d59d48cb0d3e..a4fd30be5724cb5e50dc95119f934cd7fe7e7aa0 100644
--- a/dns/locale/es_VE/fusiondirectory.po
+++ b/dns/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Error"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr "Contenido"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "Zona DNS"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Zona"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "Registro SOA"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Refresco"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Reintento"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Expiración"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/fa_IR/fusiondirectory.po b/dns/locale/fa_IR/fusiondirectory.po
index 3992ed2dff1fa38039c81ecffae51c8a1397e74e..ebd48708321b3cda8c5107eca1666deb2073630e 100644
--- a/dns/locale/fa_IR/fusiondirectory.po
+++ b/dns/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "خطا"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/fi_FI/fusiondirectory.po b/dns/locale/fi_FI/fusiondirectory.po
index 62f09a90b195dc4a9214e490a8d7110bb2592a03..7f7c31ad6f56581a60d1b1229022afa8ac5673f6 100644
--- a/dns/locale/fi_FI/fusiondirectory.po
+++ b/dns/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/fr/fusiondirectory.po b/dns/locale/fr/fusiondirectory.po
index b7c7876716324838acf6615bf5bcb01f868e638f..3985d39336a12a35408ade7023f6aac850bd7464 100644
--- a/dns/locale/fr/fusiondirectory.po
+++ b/dns/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,11 +32,11 @@ msgstr "Configuration DNS"
 
 #: config/dns/class_dnsConfig.inc:45
 msgid "DNS RDN"
-msgstr "DNS RDN"
+msgstr "Branche DNS"
 
 #: config/dns/class_dnsConfig.inc:45
 msgid "Branch in which DNS zones will be stored"
-msgstr "Branche dans laquelle les zones DNS seront stockés"
+msgstr "Branche dans laquelle les zones DNS seront stockées"
 
 #: config/dns/class_dnsConfig.inc:50
 msgid "Store final dot in domains"
@@ -45,33 +45,33 @@ msgstr "Stocker le point final dans les domaines"
 #: config/dns/class_dnsConfig.inc:50
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-"Est ce que FusionDirectory doit stocker un point final à la fin des domaines"
-" ?"
+"Est-ce que FusionDirectory doit stocker un point final à la fin des noms de "
+"domaines ?"
 
 #: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
 #: admin/dns/class_dnsAcl.inc:33
 msgid "DNS acl"
-msgstr "Acl dns"
+msgstr "Acl DNS"
 
 #: admin/dns/class_dnsAcl.inc:47
 msgid "Acl"
-msgstr "Acl"
+msgstr "ACL"
 
 #: admin/dns/class_dnsAcl.inc:51
 msgid "ACL name"
-msgstr "Nom de l'acl"
+msgstr "Nom de l'ACL"
 
 #: admin/dns/class_dnsAcl.inc:51
 msgid "Name of this acl"
-msgstr "Nom de cette acl"
+msgstr "Nom de cette ACL"
 
 #: admin/dns/class_dnsAcl.inc:56
 msgid "Address match list"
-msgstr "Liste d'adresse pour cette ACL"
+msgstr "Liste d'adresses"
 
 #: admin/dns/class_dnsAcl.inc:56
 msgid "The ip address match list for this acl"
-msgstr "La liste de correspondance d'adresse IP pour cette acl"
+msgstr "La liste de correspondance d'adresse IP pour cette ACL"
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
 #: admin/dns/class_dnsView.inc:31
@@ -92,9 +92,9 @@ msgstr "Nom de cette vue"
 
 #: admin/dns/class_dnsView.inc:53
 msgid "Match clients ACL"
-msgstr "Match clients ACL"
+msgstr "ACL clients"
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -102,25 +102,31 @@ msgstr ""
 
 #: admin/dns/class_dnsView.inc:57
 msgid "Match destinations ACL"
-msgstr "Match destinations ACL"
+msgstr "ACL destinataires"
+
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
 
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
-msgstr "Match recursive only"
+msgstr "Recursives seulement"
 
 #: admin/dns/class_dnsView.inc:61
 msgid "Match only recursive queries in this view"
 msgstr "Accepter uniquement les requêtes récursives dans cette vue"
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr "Zones DNS"
 
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
-msgstr "zones DNS dans cette vue"
+msgstr "Zones DNS dans cette vue"
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -132,38 +138,39 @@ msgstr "Gestion des DNS"
 msgid "Systems"
 msgstr "Systèmes"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr "Impossible de lancer ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr "Plus d'un serveur correspond au SOA"
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr "Impossible de trouver le serveur primaire"
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr "Impossible de lancer ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr "Ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
-msgstr "LDAP2Zone appelé pour la zone \"%s\""
+msgstr "Ldap2Zone appelé pour la zone \"%s\""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 "Le client Argonaut doit être activé pour utiliser ldap2zone à distance"
@@ -187,11 +194,11 @@ msgstr "Zone inverse"
 
 #: admin/dns/class_DnsRecordAttribute.inc:133
 msgid "Reverse zone this record should be in, if any"
-msgstr "zone inverse cet enregistrement devrait être dans, le cas échéant"
+msgstr "Zone inverse dans lequel cet enregistrement devrait être"
 
 #: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
-msgstr "enregistrement LOC "
+msgstr "Enregistrement LOC "
 
 #: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
@@ -270,9 +277,9 @@ msgid ""
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
-"Entier spécifiant l'ordre dans lequel les enregistrements NAPTR doivent être"
-" traitées pour assurer l' ordre appropriée des règles. Les petits nombres "
-"sont traités avant les grand nombre."
+"Entier indiquant l'ordre dans lequel les enregistrements NAPTR doivent être "
+"traités pour assurer l'ordre correct des règles. Les petits nombres sont "
+"traités avant les grands nombres."
 
 #: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
@@ -285,8 +292,8 @@ msgid ""
 "numbers."
 msgstr ""
 "Entier qui spécifie l'ordre dans lequel les enregistrements NAPTR  dont les "
-"valeurs \"ordre\" sont égaux doivent être traitées, Les petits nombres sont "
-"traités avant les grand nombre."
+"valeurs \"ordre\" sont égales doivent être traités, les petits nombres sont "
+"traités avant les grands nombres."
 
 #: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
@@ -298,10 +305,9 @@ msgid ""
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
-"Drapeaux pour contrôler les aspects de la réécriture et l'interprétation des"
-" champs de l'enregistrement. Les drapeaux sont des caractères uniques de "
-"l'ensemble [A-Z0-9]. Le cas des caractères alphabétiques est non "
-"significatif."
+"Drapeaux pour contrôler des aspects de la réécriture et l'interprétation des"
+" champs de l'enregistrement. Les drapeaux sont des caractères de l'ensemble "
+"[A-Z0-9]. La casse des caractères alphabétiques n’est pas prise en compte."
 
 #: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
@@ -314,10 +320,10 @@ msgid ""
 "protocol MUST be specified if the flags field states that the NAPTR is "
 "terminal."
 msgstr ""
-"Indique les services) disponibles dans cette voie de réécriture. Il peut "
-"également spécifier le protocole particulier qui est utilisé pour parler "
-"avec un service. Un protocole doit être spécifié si le drapeaux indique que "
-"le NAPTR est terminal."
+"Indique le(s) service(s) disponible(s) dans ce chemin de réécriture. Il peut"
+" également spécifier le protocole particulier qui est utilisé pour parler "
+"avec un service. Un protocole doit être spécifié si les drapeaux indiquent "
+"que le NAPTR est terminal."
 
 #: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
@@ -329,9 +335,9 @@ msgid ""
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
-"Une chaîne contenant une expression de substitution qui est appliqué à la "
-"chaîne d'origine détenu par le client afin de construire le prochain nom de "
-"domaine a rechercher."
+"Une chaîne contenant une expression de substitution qui est appliquée à la "
+"chaîne d'origine envoyée par le client afin de construire le prochain nom de"
+" domaine à rechercher."
 
 #: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
@@ -342,12 +348,12 @@ msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
-"La prochaine NOM pour interroger pour NAPTR, SRV, ou des enregistrements "
-"d'adresses en fonction de la valeur du drapeaux."
+"Le prochain NOM à interroger pour NAPTR, SRV, ou des enregistrements "
+"d'adresses en fonction de la valeur des drapeaux."
 
 #: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
-msgstr "enregistrement SRV"
+msgstr "Enregistrement SRV"
 
 #: admin/dns/class_DnsRecordAttribute.inc:291
 #: admin/dns/class_DnsRecordAttribute.inc:343
@@ -356,7 +362,8 @@ msgstr "Priorité"
 
 #: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
-msgstr "Priorité de l'hôte cible, valeur inférieure signifie préféré"
+msgstr ""
+"Priorité de l'hôte cible, plus la valeur est basse plus c’est prioritaire"
 
 #: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
@@ -367,8 +374,8 @@ msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
-"poids relatif des enregistrements avec la même priorité, valeur plus élevée "
-"signifie préféré"
+"Poids relatif des enregistrements avec la même priorité, plus la valeur est "
+"grande plus c’est prioritaire"
 
 #: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
@@ -390,8 +397,8 @@ msgstr "Cible"
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
-"nom canonique de la machine qui fournit le service, se terminant par un "
-"point"
+"Nom d’hôte canonique de la machine qui fournit le service, se terminant par "
+"un point"
 
 #: admin/dns/class_DnsRecordAttribute.inc:322
 msgid "An IPv4 address"
@@ -403,7 +410,7 @@ msgstr "Une adresse IPv6"
 
 #: admin/dns/class_DnsRecordAttribute.inc:339
 msgid "MX Record"
-msgstr "enregistrement MX"
+msgstr "Enregistrement MX"
 
 #: admin/dns/class_DnsRecordAttribute.inc:343
 msgid ""
@@ -418,16 +425,16 @@ msgid ""
 "Domain name which specifies a host willing to act as a mail exchange for the"
 " owner name"
 msgstr ""
-"Nom de domaine qui spécifie un hôte prêt à agir comme un échange de courrier"
-" pour le domaine spécifie"
+"Nom de domaine qui indique un hôte qui sert de serveur de courriel pour le "
+"domaine"
 
 #: admin/dns/class_DnsRecordAttribute.inc:360
 msgid ""
 "Domain name which specifies a host which should be authoritative for the "
 "specified class and domain"
 msgstr ""
-"Nom de domaine qui spécifie un hôte qui doit faire autorité pour la classe "
-"et le domaine spécifiés"
+"Nom de domaine qui indique un hôte qui doit faire autorité pour la classe et"
+" le domaine indiqués"
 
 #: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
@@ -439,8 +446,8 @@ msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
-"SSHFP contenu de l'enregistrement. Peut être obtenu en utilisant \"ssh-"
-"keygen -R some.host.tld\", ou la commande sshfp"
+"Contenu de l’enregistrement SSHFP. Peut être obtenu en utilisant «ssh-keygen"
+" -r some.host.tld», ou la commande sshfp par exemple"
 
 #: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
@@ -458,18 +465,18 @@ msgstr "Contenu"
 msgid "Content of this record"
 msgstr "Contenu de cet enregistrement"
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "L'adresse IP saisie ne correspond pas à la zone inverse sélectionnée"
 
 #: admin/dns/class_dnsZone.inc:27
 msgid "DNS Record domain and type"
-msgstr "Type Enregistrements DNS"
+msgstr "Type et domaine des enregistrements DNS"
 
 #: admin/dns/class_dnsZone.inc:30
 #, php-format
 msgid "%s record"
-msgstr "%s record"
+msgstr "Enregistrement %s"
 
 #: admin/dns/class_dnsZone.inc:34 admin/dns/class_dnsZone.inc:35
 msgid "DNS record"
@@ -477,129 +484,135 @@ msgstr "Enregistrement DNS"
 
 #: admin/dns/class_dnsZone.inc:49
 msgid "Subdomain"
-msgstr "sous-domaine"
+msgstr "Sous-domaine"
 
 #: admin/dns/class_dnsZone.inc:49
 msgid "Relative subdomain name"
-msgstr "Relative nom de sous-domaine"
+msgstr "Nom de sous-domaine relatif"
 
 #: admin/dns/class_dnsZone.inc:54
 msgid "DNS Record"
 msgstr "Enregistrement DNS"
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+"L'adresse IP %s ne correspond pas à la zone inverse %s, elle a été ignorée"
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
-"\"%s\" doit contenir un nom de domaine en minuscule et se terminer par un "
-"point final.<br/><br/> Exemple:. Exemple.com."
+"«%s» doit contenir un nom de domaine en minuscule et se terminer par un "
+"point final.<br/><br/> Exemple : exemple.fr."
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
-"\"%s\" doit contenir un nom de domaine en minuscule.<br/><br/> Exemple: "
-"exemple.com"
+"«%s» doit contenir un nom de domaine en minuscule.<br/><br/> Exemple : "
+"exemple.fr"
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "Zone DNS"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Nom de la zone"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr "Zones inverses"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
-"Zones inverse pour cette zone sous la forme xx.xx.in-addr.arpa%1$s ou "
+"Zones inverses pour cette zone sous la forme xx.xx.in-addr.arpa%1$s ou "
 "x.x.ip6.arpa%1$s"
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "Enregistrement SOA"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr "Enregistrement SOA"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr "Serveur DNS primaire"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
-"Nom de domaine du serveur de noms qui a été la source d'origine ou primaire "
-"de données pour cette zone"
+"Nom de domaine du serveur de noms qui est la source d'origine ou primaire de"
+" données pour cette zone"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
-msgstr "Adresse de messagerie"
+msgstr "Adresse de courriel"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
-"Nom de domaine qui spécifie la boîte aux lettres de la personne responsable "
+"Nom de domaine qui spécifie la boite de courriel de la personne responsable "
 "de cette zone"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr "Numéro de série"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr "Numéro de version de la copie originale de la zone"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
-msgstr "intervalle de temps avant que la zone doive être rafraîchie"
+msgstr "Intervalle de temps avant que la zone doive être rafraîchie"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Réessayer"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
-"intervalle de temps qui devrait s'écouler avant qu'un rafraîchissement "
-"défectueux doive être retenté"
+"Intervalle de temps qui devrait s'écouler avant qu'un rafraîchissement "
+"défectueux doive être réessayé"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Expirer"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
@@ -607,67 +620,66 @@ msgstr ""
 "La valeur du temps qui spécifie la limite supérieure de l'intervalle de "
 "temps qui peut s'écouler avant que la zone ne soit plus autoritaire"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
-msgstr "champ TTL minimum qui doit être exporté avec un RR de cette zone"
+msgstr "Champ TTL minimum qui doit être exporté avec un RR de cette zone"
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr "Enregistrements"
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr "Les enregistrements DNS pour cette zone"
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
-msgstr "Modifier les zones DNS d'un système"
+msgstr "Éditer les zones DNS d'un système"
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
-msgstr "zones DNS pour cet hôte"
+msgstr "Zones DNS pour cet hôte"
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
-msgstr "enregistrements SOA"
+msgstr "Enregistrements SOA"
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
-msgstr "enregistrements DNS"
+msgstr "Enregistrements DNS"
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr "Serveurs primaires"
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
-msgstr "Les enregistrements DNS pour la zone \"%s\""
+msgstr "Les enregistrements DNS pour la zone «%s»"
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
-msgstr "Le serveur principal pour la zone \"%s\""
+msgstr "Le serveur primaire pour la zone «%s»"
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
-msgstr ""
-"%d enregistrements ont été mis à jour à partir de %s vers %s dans la zone %s"
+msgstr "%d enregistrements ont été mis à jour de %s vers %s dans la zone %s"
 
-#: admin/systems/class_dnsHost.inc:373
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
+msgstr "Mise à jour DNS"
+
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr "%d enregistrements ont été enlevés dans la zone %s"
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
-msgstr "mise à jour DNS"
-
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Droits insuffisants"
diff --git a/dns/locale/hu_HU/fusiondirectory.po b/dns/locale/hu_HU/fusiondirectory.po
index 60d0753f9b4893a7b90522c21055b28d45e02b3f..f8a7efc6769973e5677f3dfeedfb4255f5981188 100644
--- a/dns/locale/hu_HU/fusiondirectory.po
+++ b/dns/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -100,6 +100,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -108,7 +114,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +122,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +134,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -420,7 +427,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,170 +456,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/id/fusiondirectory.po b/dns/locale/id/fusiondirectory.po
index 22ec496168813b8bcbe22d0380ce1bb4b360a4e7..9e8c7a7f3780b18d241e29c04d91dd0f43babb65 100644
--- a/dns/locale/id/fusiondirectory.po
+++ b/dns/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -100,6 +100,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -108,7 +114,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +122,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +134,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -420,7 +427,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,170 +456,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/it_IT/fusiondirectory.po b/dns/locale/it_IT/fusiondirectory.po
index c21e7aeee24c129f9b1031d629d09b39712210b7..b965eb1df77afa6ad8c3fdfadcd434f2ca9d374a 100644
--- a/dns/locale/it_IT/fusiondirectory.po
+++ b/dns/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,7 +92,7 @@ msgstr "Nome di questa vista"
 msgid "Match clients ACL"
 msgstr "Abbinamento cliente ACL"
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -103,6 +103,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr "Abbinamento destinazioni ACL"
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr "Abbinamento query ricorsive"
@@ -111,7 +117,7 @@ msgstr "Abbinamento query ricorsive"
 msgid "Match only recursive queries in this view"
 msgstr "Abbinare solo le query ricorsive in questa vista"
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr "Zone DNS"
 
@@ -119,7 +125,7 @@ msgstr "Zone DNS"
 msgid "DNS zones in this view"
 msgstr "Zone DNS in questa vista"
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -131,38 +137,39 @@ msgstr "Gestione DNS"
 msgid "Systems"
 msgstr "Sistemi"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr "Impossibile eseguire ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr "Più di un server corrisponde al SOA"
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr "Impossibile trovare il server primario"
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr "Impossibile ottenere run ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr "Zona LDAP2"
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr "Ldap2Zone chiamata per la zona \"%s\""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Errore"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 "Il cliente Argonaut dev'essere attivato per utilizzare ldap2zone a distanza"
@@ -459,7 +466,7 @@ msgstr "Contenuto"
 msgid "Content of this record"
 msgstr "Contenuto di questo record"
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "L'IP immesso non corrisponde alla zona inversa selezionata"
 
@@ -488,12 +495,17 @@ msgstr "Nome relativo di sottodominio"
 msgid "DNS Record"
 msgstr "Record DNS"
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr "L'IP 1%s non corrisponde al reverse 1%s selezionato, è stato ignorato"
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
@@ -502,7 +514,7 @@ msgstr ""
 "\"%s\" deve contenere un nome di dominio in caratteri minuscoli e terminare "
 "con un punto finale.<br/>Esempio: example.com."
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
@@ -511,24 +523,24 @@ msgstr ""
 "%s\" deve contenere un nome di dominio in minuscolo.<br/><br/>Esempio: "
 "esempio.com"
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "Zona DNS"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Zona"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Nome della zona"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr "Zone inverse"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
@@ -537,19 +549,19 @@ msgstr ""
 "Zone inverse per questa zona in forma xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "Record SOA"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr "Record SOA"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr "Server DNS primario"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
@@ -557,11 +569,11 @@ msgstr ""
 "Nome di dominio del server che è stato la fonte originale o primaria dei "
 "dati per questa zona"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Indirizzo di posta elettronica"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
@@ -569,38 +581,38 @@ msgstr ""
 "Nome di dominio che specifica la mailbox della persona responsabile di "
 "questa zona"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr "Numero di serie"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr "Numero di versione della copia originale della zona"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr "Intervallo di tempo prima che la zona venga aggiornata"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Riprova"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 "Intervallo di tempo che deve trascorrere prima che un aggiornamento fallito "
 "venga ritentato"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Scadenza"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
@@ -608,67 +620,67 @@ msgstr ""
 "Valore temporale che specifica il limite superiore dell'intervallo di tempo "
 "che può trascorrere prima che la zona non sia più autorevole"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 "Campo minimo TTL che deve essere esportato con qualsiasi RR da questa zona"
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr "Records"
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr "Records DNS per questa zona"
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr "Modificare le zone DNS di un sistema"
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr "Zone DNS per questo host"
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr "Record SOA"
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr "Records DNS"
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr "Servers primari"
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr "Records DNS par la zona \"%s\""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr "Server primario per la zona \"%s\""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr "%d records sono stati aggiornati da %s a %s nella zona %s"
 
-#: admin/systems/class_dnsHost.inc:373
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
+msgstr "Aggiornamento DNS"
+
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr "%d records sono stati rimossi nella zona %s"
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
-msgstr "Aggiornamento DNS"
-
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Autorizzazioni insufficienti"
diff --git a/dns/locale/lv/fusiondirectory.po b/dns/locale/lv/fusiondirectory.po
index c887c20fbc7a5454e0ba023dcca0a2f0bf0ff1d0..c6fa40e1bbb47ea0db7e039a9607c72f5247a78b 100644
--- a/dns/locale/lv/fusiondirectory.po
+++ b/dns/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Kļūda"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "E-pasta adrese"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/nb/fusiondirectory.po b/dns/locale/nb/fusiondirectory.po
index 3e96390f97ff6045c562ba4f3538f0e59562eb65..f263829190776a47896c28e0db87914291d73448 100644
--- a/dns/locale/nb/fusiondirectory.po
+++ b/dns/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Feil"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/nl/fusiondirectory.po b/dns/locale/nl/fusiondirectory.po
index 19f2f4e11b1970cfeb4a225e658e270f530f59d5..1d0f5435ca18cbc6b5383178cf2c4c5d985a50ff 100644
--- a/dns/locale/nl/fusiondirectory.po
+++ b/dns/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr "DNS zones"
 
@@ -117,7 +123,7 @@ msgstr "DNS zones"
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "Systemen"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr "Meer dan één server komt overeen met de SOA"
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr "Kan de primaire server niet vinden"
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr "LDAP2zone"
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Fout"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr "Inhoud"
 msgid "Content of this record"
 msgstr "Inhoud van de record"
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,72 +457,77 @@ msgstr ""
 msgid "DNS Record"
 msgstr "DNS record"
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "DNZ zone"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Zone-naam"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "SOA record"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr "SOA record"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr "Primaire DNS server"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
@@ -523,101 +535,101 @@ msgstr ""
 "Domein naam dat specifiek is voor de mailbox van de persoon die "
 "verantwoordelijk is voor deze zone"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr "Serienummer"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Ververs"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Vervaltijd"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr "Records"
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr "De DNS records voor deze zone"
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr "SOA records"
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr "DNS records"
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
+msgstr "DNS update"
+
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
-msgstr "DNS update"
-
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Onvoldoende rechten"
diff --git a/dns/locale/pl/fusiondirectory.po b/dns/locale/pl/fusiondirectory.po
index 5b91a481832e6dbbfa103b6ea745ee3040f16e29..f449977109119f8c725904c7bff9c0a2ac54fa54 100644
--- a/dns/locale/pl/fusiondirectory.po
+++ b/dns/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/dns/class_dnsConfig.inc:28
 msgid "DNS configuration"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "Systemy"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Strefa"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Nazwa strefy"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "Rekord SOA"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Adres email"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Ponawia"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Wygasa"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/pt/fusiondirectory.po b/dns/locale/pt/fusiondirectory.po
index f4a0903037c788498f347a25174b2abbb09e66de..3123e4286a2b650f290605e9480b095b0c116f1b 100644
--- a/dns/locale/pt/fusiondirectory.po
+++ b/dns/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Endereço de Correio"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Recarregar"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/pt_BR/fusiondirectory.po b/dns/locale/pt_BR/fusiondirectory.po
index da3605c6cb93c927ac244a16dc08448a6c5d83c0..fbcee4adbcf489ccb58d92b584b2f843e0a77dc2 100644
--- a/dns/locale/pt_BR/fusiondirectory.po
+++ b/dns/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr "Conteúdo"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "Zona DNS"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Nome da zona"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "E-mail"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Tente novamente"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/ru/fusiondirectory.po b/dns/locale/ru/fusiondirectory.po
index 5ac5830d0315aade4dc88ae33c34147b8ec5545e..fdef48b7f3a18c0e6585fd3bd9d786b7e224502d 100644
--- a/dns/locale/ru/fusiondirectory.po
+++ b/dns/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -92,7 +92,7 @@ msgstr "Название для вида (view)"
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr "Зоны DNS"
 
@@ -117,7 +123,7 @@ msgstr "Зоны DNS"
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +135,39 @@ msgstr "Управление DNS"
 msgid "Systems"
 msgstr "Системы"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr "Ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Ошибка"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -442,7 +449,7 @@ msgstr "Содержимое"
 msgid "Content of this record"
 msgstr "Содержимое записи"
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "Введенный IP не соответствует выбранной обратной зоне"
 
@@ -471,43 +478,48 @@ msgstr ""
 msgid "DNS Record"
 msgstr "DNS запись"
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr " DNZ зона"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Зона"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "Имя зоны"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr "Обратные зоны"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
@@ -515,19 +527,19 @@ msgid ""
 msgstr ""
 "Обратные зоны для зоны в формате xx.xx.in-addr.arpa%1$s или x.x.ip6.arpa%1$s"
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "SOA запись"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr "SOA Запись"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr "Первичный DNS сервер"
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
@@ -535,11 +547,11 @@ msgstr ""
 "Доменное имя сервера имен, который будет начальным или первичным источником "
 "данных для этой зоны"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Адрес электронной почты"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
@@ -547,37 +559,37 @@ msgstr ""
 "Доменное имя для которой указанный почтовый ящик - человека ответственного "
 "за эту зону"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr "Serial number"
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr "Номер версии неповторимой копии зоны"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Refresh"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr "Время по истечению которого зона будет обновлена"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "Retry"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 "Время по истечению которого можно будет повторить обновление после ошибки"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "Expire"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
@@ -585,68 +597,68 @@ msgstr ""
 "Значение верхней границе времени, по истечению которого зона больше не будет"
 " авторитативной "
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 "Минимальное значение поля TTL, которое будет экспортировано с каждой RR для "
 "этой зоны"
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr "Записи"
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr "DNS записи зоны"
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr "Редактировать DNS зоны системы"
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr "DNS зоны хоста"
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr "SOA записи"
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr "DNS записи"
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr "Первичные сервера"
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr "DNS записи для зоны \"%s\""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr "Первичный сервер для зоны \"%s\""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr "Количество записей, обновленных с %s на %s в зоне %s - %d"
 
-#: admin/systems/class_dnsHost.inc:373
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
+msgstr "Обновить DNS"
+
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr "%d записей было удалено в зоне %s"
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
-msgstr "Обновить DNS"
-
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Недостаточно прав"
diff --git a/dns/locale/ru@petr1708/fusiondirectory.po b/dns/locale/ru@petr1708/fusiondirectory.po
index f9c93d00b2e143f322f93b1ce4e1f50a78438e9e..f6dc95489596e552812211dcf7dbd23d9a2e3cf0 100644
--- a/dns/locale/ru@petr1708/fusiondirectory.po
+++ b/dns/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -100,6 +100,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -108,7 +114,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +122,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +134,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -420,7 +427,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,170 +456,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/sv/fusiondirectory.po b/dns/locale/sv/fusiondirectory.po
index ddc77a1c1deef0941ddfb8080644dba3eadb706a..469006ff05a23b7df300f05fb542016ef2e5b31f 100644
--- a/dns/locale/sv/fusiondirectory.po
+++ b/dns/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "System"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Fel"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr "Innehåll"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr "DNS-zon"
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Epostadress"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/ug/fusiondirectory.po b/dns/locale/ug/fusiondirectory.po
index fc3dfad5b845d38d8e7f2348dbf70404636b70f2..71ef7fc689259c8de07a6a2b20be5e658ae6968f 100644
--- a/dns/locale/ug/fusiondirectory.po
+++ b/dns/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -100,6 +100,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -108,7 +114,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +122,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +134,39 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -420,7 +427,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,170 +456,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/vi_VN/fusiondirectory.po b/dns/locale/vi_VN/fusiondirectory.po
index f0757eafc68f82a936caa968485aa69e04b88f1f..59ff41c01fcf9ec9d6606c04e24f3f44f6dd9662 100644
--- a/dns/locale/vi_VN/fusiondirectory.po
+++ b/dns/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "Các hệ thống"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "Địa chỉ thư"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/zh/fusiondirectory.po b/dns/locale/zh/fusiondirectory.po
index 5ad21abb0a74f57fbd4787915ecb924030199e7a..98dbf3c434a838166cc34b949ffcbff9a3e175db 100644
--- a/dns/locale/zh/fusiondirectory.po
+++ b/dns/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Match clients ACL"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
+#: admin/dns/class_dnsView.inc:53
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
 msgstr ""
@@ -101,6 +101,12 @@ msgstr ""
 msgid "Match destinations ACL"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:61
 msgid "Match recursive only"
 msgstr ""
@@ -109,7 +115,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
 msgid "DNS zones"
 msgstr ""
 
@@ -117,7 +123,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
 msgid "DNS"
 msgstr ""
 
@@ -129,38 +135,39 @@ msgstr ""
 msgid "Systems"
 msgstr "系统设置"
 
-#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
-#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
-#: admin/systems/class_dnsHost.inc:302
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:91
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:93
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:107
+#: admin/dns/class_dnsManagement.inc:106
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:372
+#: admin/systems/class_dnsHost.inc:319
 msgid "Error"
 msgstr "错误"
 
-#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -421,7 +428,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:441
+#: admin/dns/class_DnsRecordAttribute.inc:431
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,170 +457,175 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
-#: admin/dns/class_dnsZone.inc:421
+#: admin/dns/class_dnsZone.inc:360 admin/dns/class_dnsZone.inc:411
+#: admin/dns/class_dnsZone.inc:440
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
-#: admin/dns/class_dnsZone.inc:534
+#: admin/dns/class_dnsZone.inc:373
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:565
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:537
+#: admin/dns/class_dnsZone.inc:568
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:558 admin/dns/class_dnsZone.inc:559
-#: admin/dns/class_dnsZone.inc:561
+#: admin/dns/class_dnsZone.inc:589 admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:592
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:576
+#: admin/dns/class_dnsZone.inc:607
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/dns/class_dnsZone.inc:580
+#: admin/dns/class_dnsZone.inc:611
 msgid "Zone name"
 msgstr "域名称"
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:590
+#: admin/dns/class_dnsZone.inc:621
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:603
+#: admin/dns/class_dnsZone.inc:634
 msgid "SOA record"
 msgstr "SOA 记录"
 
-#: admin/dns/class_dnsZone.inc:606
+#: admin/dns/class_dnsZone.inc:637
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:610
+#: admin/dns/class_dnsZone.inc:641
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: admin/dns/class_dnsZone.inc:614
+#: admin/dns/class_dnsZone.inc:645
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:618
+#: admin/dns/class_dnsZone.inc:649
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Refresh"
 msgstr "刷新"
 
-#: admin/dns/class_dnsZone.inc:623
+#: admin/dns/class_dnsZone.inc:654
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid "Retry"
 msgstr "重试"
 
-#: admin/dns/class_dnsZone.inc:628
+#: admin/dns/class_dnsZone.inc:659
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid "Expire"
 msgstr "过期"
 
-#: admin/dns/class_dnsZone.inc:633
+#: admin/dns/class_dnsZone.inc:664
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:638
+#: admin/dns/class_dnsZone.inc:669
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:649
+#: admin/dns/class_dnsZone.inc:680
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:653
+#: admin/dns/class_dnsZone.inc:684
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:119
+#: admin/systems/class_dnsHost.inc:124
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:140
+#: admin/systems/class_dnsHost.inc:145
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:147
+#: admin/systems/class_dnsHost.inc:152
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:216
+#: admin/systems/class_dnsHost.inc:226
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:235
+#: admin/systems/class_dnsHost.inc:245
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:256
+#: admin/systems/class_dnsHost.inc:267
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:373
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:382
-msgid "DNS update"
+#: admin/systems/class_dnsHost.inc:465 admin/systems/class_dnsHost.inc:482
+#, php-format
+msgid "%d records were removed in zone %s"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dovecot/locale/ar/fusiondirectory.po b/dovecot/locale/ar/fusiondirectory.po
index b3a2796afa8c9f23602bd0528100d05fc5794ba9..3975837dd4b2a8a49153c0dcdd6a67fa2d3803ec 100644
--- a/dovecot/locale/ar/fusiondirectory.po
+++ b/dovecot/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/dovecot/locale/ca/fusiondirectory.po b/dovecot/locale/ca/fusiondirectory.po
index 49f70f06f21ec43643f56d2f60e38a5d6e9bbae3..36af5c11127fd33b32cf3fdc723daec2d08d5f17 100644
--- a/dovecot/locale/ca/fusiondirectory.po
+++ b/dovecot/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/dovecot/locale/cs_CZ/fusiondirectory.po b/dovecot/locale/cs_CZ/fusiondirectory.po
index 25a0bf16de2215734466e6226451c381cfc4225b..d8b6318dc988b9413adf0e56b3b717067983fcd9 100644
--- a/dovecot/locale/cs_CZ/fusiondirectory.po
+++ b/dovecot/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/dovecot/locale/de/fusiondirectory.po b/dovecot/locale/de/fusiondirectory.po
index f4318bd508d86ee400f74794eff880144033fa9a..5b217a5b4691a48f5a23205857995cbfbbc40d7b 100644
--- a/dovecot/locale/de/fusiondirectory.po
+++ b/dovecot/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/dovecot/locale/el_GR/fusiondirectory.po b/dovecot/locale/el_GR/fusiondirectory.po
index ef89f66a48184c249b576ab1e87417a0b77bc48a..a48253313c112ce72f3efcb00e6d353375bb6b8e 100644
--- a/dovecot/locale/el_GR/fusiondirectory.po
+++ b/dovecot/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/dovecot/locale/en/fusiondirectory.po b/dovecot/locale/en/fusiondirectory.po
index 1d9ea7a1b344048827676f72ceea7677d0c81886..eb743d82eaf568186234a3bd43ae09d035524416 100644
--- a/dovecot/locale/en/fusiondirectory.po
+++ b/dovecot/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/dovecot/locale/es/fusiondirectory.po b/dovecot/locale/es/fusiondirectory.po
index aba122e44ca0030bf1178b025eb40b566f0d4ce0..95e49ac26377283d8b3b0bbacc4b521c668a1464 100644
--- a/dovecot/locale/es/fusiondirectory.po
+++ b/dovecot/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/dovecot/locale/es_CO/fusiondirectory.po b/dovecot/locale/es_CO/fusiondirectory.po
index 5e19761b9ee8a6c2525de77d324821e5161275f9..1d09ea09b8701d99333f70f6922683f3f52bcc1b 100644
--- a/dovecot/locale/es_CO/fusiondirectory.po
+++ b/dovecot/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/dovecot/locale/es_VE/fusiondirectory.po b/dovecot/locale/es_VE/fusiondirectory.po
index b3517de905b140998c002a4b6ab35ace0f03bdaf..634ee215cf97e0c6b99eece67837f5c7145c144d 100644
--- a/dovecot/locale/es_VE/fusiondirectory.po
+++ b/dovecot/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/dovecot/locale/fa_IR/fusiondirectory.po b/dovecot/locale/fa_IR/fusiondirectory.po
index e7e4463bc7c29ca9fad7a1ef964c487b65b4236b..a00c2e9b4cf028fe094ac2cb366c8ce51a3687ae 100644
--- a/dovecot/locale/fa_IR/fusiondirectory.po
+++ b/dovecot/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/fi_FI/fusiondirectory.po b/dovecot/locale/fi_FI/fusiondirectory.po
index 3246400562eeee5e9480a29e0a41d8d18df49a7f..013a742da7df7e27297c5501a33b927a5fe0bf34 100644
--- a/dovecot/locale/fi_FI/fusiondirectory.po
+++ b/dovecot/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/dovecot/locale/fr/fusiondirectory.po b/dovecot/locale/fr/fusiondirectory.po
index f1e8675ccd6e74b8c6702acb02d94d261ec22d3e..ba642c2b12f1cc7a469bf1e855467dd707c2b7be 100644
--- a/dovecot/locale/fr/fusiondirectory.po
+++ b/dovecot/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/dovecot/locale/hu_HU/fusiondirectory.po b/dovecot/locale/hu_HU/fusiondirectory.po
index aabddb23a9cf56c2c3e724255c2b055aa0d28484..308d4cb2517c6f3bf12d8299a0035aa6d8e5f67e 100644
--- a/dovecot/locale/hu_HU/fusiondirectory.po
+++ b/dovecot/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/id/fusiondirectory.po b/dovecot/locale/id/fusiondirectory.po
index fbe22243fa137e03d15988342046df27fc9f5344..baf39ab39f50926d08608500af7c1ef338a51c59 100644
--- a/dovecot/locale/id/fusiondirectory.po
+++ b/dovecot/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/it_IT/fusiondirectory.po b/dovecot/locale/it_IT/fusiondirectory.po
index 1fba70beb8990b73d9db270cab001a0eae004fe1..523e532c5e1d1a3470238bc41cf0ff35f0c33203 100644
--- a/dovecot/locale/it_IT/fusiondirectory.po
+++ b/dovecot/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/dovecot/locale/lv/fusiondirectory.po b/dovecot/locale/lv/fusiondirectory.po
index 5023643981c578bc229f12f10403c8f14c4d2ac5..7eb91396e287cec2a48b62d535b0a754f02c0e12 100644
--- a/dovecot/locale/lv/fusiondirectory.po
+++ b/dovecot/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/nb/fusiondirectory.po b/dovecot/locale/nb/fusiondirectory.po
index 01ba83984ce844c085f437ebefc55cbe0f089618..9769ef36730591f8fd9dbbee5576c00930015e64 100644
--- a/dovecot/locale/nb/fusiondirectory.po
+++ b/dovecot/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/nl/fusiondirectory.po b/dovecot/locale/nl/fusiondirectory.po
index 75f71e815cf9d1c9d9a34a9754b6a2d0ea368ce3..abfea05f0b08c38968d6b714ce0f55c700302b10 100644
--- a/dovecot/locale/nl/fusiondirectory.po
+++ b/dovecot/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/dovecot/locale/pl/fusiondirectory.po b/dovecot/locale/pl/fusiondirectory.po
index 59919b1f93c9e6d4ee644456b036243c9ebaf185..211902ba24bd2d9b9018f6197661d40fe8006c46 100644
--- a/dovecot/locale/pl/fusiondirectory.po
+++ b/dovecot/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
diff --git a/dovecot/locale/pt/fusiondirectory.po b/dovecot/locale/pt/fusiondirectory.po
index 07c1d40f6588a1d5748e64e3a8d836b8cc6aeb52..92c22583bb353841a115e849c2165015e241e7e9 100644
--- a/dovecot/locale/pt/fusiondirectory.po
+++ b/dovecot/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/dovecot/locale/pt_BR/fusiondirectory.po b/dovecot/locale/pt_BR/fusiondirectory.po
index 2d07b8eb5592e2c03591e20b7f02b2e951ad0cb1..1276701782c0f5da54f59b2e26de7922491ed926 100644
--- a/dovecot/locale/pt_BR/fusiondirectory.po
+++ b/dovecot/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/dovecot/locale/ru/fusiondirectory.po b/dovecot/locale/ru/fusiondirectory.po
index 800c21f348e6dfc5909788727db8c85d8c211ea3..8abf149d45f4c1c8b5359ea8473c1a6ad47765cf 100644
--- a/dovecot/locale/ru/fusiondirectory.po
+++ b/dovecot/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/dovecot/locale/ru@petr1708/fusiondirectory.po b/dovecot/locale/ru@petr1708/fusiondirectory.po
index cd61802a6b9eeb0f0859672758273837f9a81c93..59a0a90d04d17d8e14c05670e8168309b3dd44de 100644
--- a/dovecot/locale/ru@petr1708/fusiondirectory.po
+++ b/dovecot/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/sv/fusiondirectory.po b/dovecot/locale/sv/fusiondirectory.po
index 874d4ffa39d3fbefabd62766a726f6b8f022e238..6b0d947ede4837eb96336fa7a30470098d2a358a 100644
--- a/dovecot/locale/sv/fusiondirectory.po
+++ b/dovecot/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/dovecot/locale/ug/fusiondirectory.po b/dovecot/locale/ug/fusiondirectory.po
index 4c5291002429b4c49717ffed6309eac7af12ec4e..d5cef5e380b9e179d8bc2aa9fae03c081b401cf5 100644
--- a/dovecot/locale/ug/fusiondirectory.po
+++ b/dovecot/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/vi_VN/fusiondirectory.po b/dovecot/locale/vi_VN/fusiondirectory.po
index ebff231a4648a99468917e4f0343d9c3cc4bae91..87be484917fdc4a69235bce498163187443367bb 100644
--- a/dovecot/locale/vi_VN/fusiondirectory.po
+++ b/dovecot/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/dovecot/locale/zh/fusiondirectory.po b/dovecot/locale/zh/fusiondirectory.po
index 778c8c615e653aac32933b0ab91b071b279060e2..384141539f2b0be542f71e8d0f5cf661693e1848 100644
--- a/dovecot/locale/zh/fusiondirectory.po
+++ b/dovecot/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/dsa/locale/ar/fusiondirectory.po b/dsa/locale/ar/fusiondirectory.po
index 2f8200b793b57fc079f5ad578c12204e33f37bde..288877d5510d8a830fd2b2715087342f121eba9b 100644
--- a/dsa/locale/ar/fusiondirectory.po
+++ b/dsa/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/dsa/locale/ca/fusiondirectory.po b/dsa/locale/ca/fusiondirectory.po
index eed7682cafa222d8205cc1a0f55e9c0e03ef5db2..94252167dadeca00126852f9626be7c88388ea2d 100644
--- a/dsa/locale/ca/fusiondirectory.po
+++ b/dsa/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/dsa/locale/cs_CZ/fusiondirectory.po b/dsa/locale/cs_CZ/fusiondirectory.po
index 4f3ad0b5db75c813084447a05da9004c80f9475d..8cb950dac4a5c7e14939a7158486dd2d385fe745 100644
--- a/dsa/locale/cs_CZ/fusiondirectory.po
+++ b/dsa/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/dsa/locale/de/fusiondirectory.po b/dsa/locale/de/fusiondirectory.po
index 47f34b62c40e3d938d6f870632fcf13adbfeeb73..3c596f9988a10dca555f688a8739ce7e248baa50 100644
--- a/dsa/locale/de/fusiondirectory.po
+++ b/dsa/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/dsa/locale/el_GR/fusiondirectory.po b/dsa/locale/el_GR/fusiondirectory.po
index aa9930785f608fe564f06634b928e269898af861..692cfa0c60143ccaf0713601f83fdbed93c073f1 100644
--- a/dsa/locale/el_GR/fusiondirectory.po
+++ b/dsa/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/dsa/locale/en/fusiondirectory.po b/dsa/locale/en/fusiondirectory.po
index 484927579c6e0dfe0054dcc44ff3ccfd86555995..463c347d32b156123a2e69990a66bab7885a46ec 100644
--- a/dsa/locale/en/fusiondirectory.po
+++ b/dsa/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/dsa/locale/es/fusiondirectory.po b/dsa/locale/es/fusiondirectory.po
index c8222aad4977f5aca7fcc3db383d394125a4b6b4..4d8bf8b8070e672adaa24cb1a60f8b80c708d6d3 100644
--- a/dsa/locale/es/fusiondirectory.po
+++ b/dsa/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/dsa/locale/es_CO/fusiondirectory.po b/dsa/locale/es_CO/fusiondirectory.po
index 1a2a32a030fb7f068893eba0e9d4224c90b83197..76182a910f2605b21e85f5f22227d04cd72b2903 100644
--- a/dsa/locale/es_CO/fusiondirectory.po
+++ b/dsa/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/dsa/locale/es_VE/fusiondirectory.po b/dsa/locale/es_VE/fusiondirectory.po
index ee6f0e42427e724d6f5d8aaac172f1fce4fe5976..31d18d98c77a230cea291b217270cd885ee131b7 100644
--- a/dsa/locale/es_VE/fusiondirectory.po
+++ b/dsa/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/dsa/locale/fa_IR/fusiondirectory.po b/dsa/locale/fa_IR/fusiondirectory.po
index 71403e17459fdaa55e2e2d4b40ed8dccb845d7ed..6f0f58cc49a12ff0132484336885be78e792376d 100644
--- a/dsa/locale/fa_IR/fusiondirectory.po
+++ b/dsa/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/fi_FI/fusiondirectory.po b/dsa/locale/fi_FI/fusiondirectory.po
index a9d2525b48620b166b9031ba77bf5534925b8742..46a532be0ae9a9268066b9fa61c5ac6d35b227c4 100644
--- a/dsa/locale/fi_FI/fusiondirectory.po
+++ b/dsa/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/dsa/locale/fr/fusiondirectory.po b/dsa/locale/fr/fusiondirectory.po
index b3026a0fff94622fadf14a92253438a5005a0e08..afb408e9a79561ad20ede65bb16388b959cc697e 100644
--- a/dsa/locale/fr/fusiondirectory.po
+++ b/dsa/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,24 +33,24 @@ msgstr "DSA"
 
 #: config/dsa/class_dsaConfig.inc:45
 msgid "DSA RDN"
-msgstr "DSA RDN"
+msgstr "Branche DSA"
 
 #: config/dsa/class_dsaConfig.inc:45
 msgid "Branch in which Directory Service Account (dsa) will be stored"
 msgstr ""
-"Branche dans laquelle les compte DSA (Directory Service Account)  sont "
+"Branche dans laquelle les comptes DSA (Directory Service Account) seront "
 "stockés"
 
 #: admin/dsa/class_dsaManagement.inc:35
 msgid "DSA management"
-msgstr "Gestion des objets de sécurité"
+msgstr "Gestion DSA"
 
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
 #: admin/dsa/class_simpleSecurityObject.inc:51
 msgid "Simple security object"
-msgstr "simple objet de sécurité"
+msgstr "Objet de sécurité simple"
 
 #: admin/dsa/class_simpleSecurityObject.inc:55
 msgid "Entry name"
@@ -66,7 +66,7 @@ msgstr "Description"
 
 #: admin/dsa/class_simpleSecurityObject.inc:59
 msgid "Description of this simple security object"
-msgstr "Description de ce compte  DSA"
+msgstr "Description de ce compte DSA"
 
 #: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
diff --git a/dsa/locale/hu_HU/fusiondirectory.po b/dsa/locale/hu_HU/fusiondirectory.po
index 9cbebfc1826adfc86974b54cb1ca81549ff46477..0263d4feeecc9fbf262b9627afeee0582ea60e0e 100644
--- a/dsa/locale/hu_HU/fusiondirectory.po
+++ b/dsa/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/dsa/locale/id/fusiondirectory.po b/dsa/locale/id/fusiondirectory.po
index 85a7d16db0c3c6ed0017be746b1b59a7187957a0..36afa7ae91602e2e9b7f396946f43f906fc8ab9b 100644
--- a/dsa/locale/id/fusiondirectory.po
+++ b/dsa/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/it_IT/fusiondirectory.po b/dsa/locale/it_IT/fusiondirectory.po
index 0be438ec69cd5ab1f3f2230f8f8b9364e6593272..c43a19b190a871ada73c0e389b1a7e6c8151064f 100644
--- a/dsa/locale/it_IT/fusiondirectory.po
+++ b/dsa/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/dsa/locale/lv/fusiondirectory.po b/dsa/locale/lv/fusiondirectory.po
index f88f9bed66e69d681de8d9649fa7d4546bdc1ebf..b30d3a4944d766b1c045a0b6c06397432d0a541a 100644
--- a/dsa/locale/lv/fusiondirectory.po
+++ b/dsa/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/dsa/locale/nb/fusiondirectory.po b/dsa/locale/nb/fusiondirectory.po
index fb0d468a698620625cfa2ff9ad9fec1145032d83..bc719f61c58d14c021f3fef4747746fc80148f56 100644
--- a/dsa/locale/nb/fusiondirectory.po
+++ b/dsa/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/dsa/locale/nl/fusiondirectory.po b/dsa/locale/nl/fusiondirectory.po
index d0a398b45782aaff736f0493788623d2e1d0e454..e8096eb3e64b947ae0eaa368ed251baca4a83bac 100644
--- a/dsa/locale/nl/fusiondirectory.po
+++ b/dsa/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/dsa/locale/pl/fusiondirectory.po b/dsa/locale/pl/fusiondirectory.po
index 0813e38b018bae5695cc313cf5103fffe280aec3..9d4328693f113b9f2940d51ca20fc2376ee2f977 100644
--- a/dsa/locale/pl/fusiondirectory.po
+++ b/dsa/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/dsa/class_dsaConfig.inc:28
 msgid "DSA configuration"
diff --git a/dsa/locale/pt/fusiondirectory.po b/dsa/locale/pt/fusiondirectory.po
index 4f3db5b4968add3d4369df6d93d5013e8a4e2785..2ffa996962452fa36a1987babce1772561db5591 100644
--- a/dsa/locale/pt/fusiondirectory.po
+++ b/dsa/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/dsa/locale/pt_BR/fusiondirectory.po b/dsa/locale/pt_BR/fusiondirectory.po
index a1b8145554269a5425a7a3f5a58e7fbaa79a4907..b279ab72792a607d758b9aa03ba4f5269ed01ffb 100644
--- a/dsa/locale/pt_BR/fusiondirectory.po
+++ b/dsa/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/dsa/locale/ru/fusiondirectory.po b/dsa/locale/ru/fusiondirectory.po
index b6199892d75e9ea121177c6f647fd0bde4807d5d..b7fcc61a30df6acdab5bc30471e59d62bd427697 100644
--- a/dsa/locale/ru/fusiondirectory.po
+++ b/dsa/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/dsa/locale/ru@petr1708/fusiondirectory.po b/dsa/locale/ru@petr1708/fusiondirectory.po
index 5727a6a3b2bd6775a7f1a126db680fef80c37be0..31d2f547fb3162db7deb9bd2c227d6fed2cd2744 100644
--- a/dsa/locale/ru@petr1708/fusiondirectory.po
+++ b/dsa/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/sv/fusiondirectory.po b/dsa/locale/sv/fusiondirectory.po
index e420e0f2706ec1879e0a6644ab4e16c839b9b427..23df98a2c4363be7fdd17670c7b932f92cd2b457 100644
--- a/dsa/locale/sv/fusiondirectory.po
+++ b/dsa/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/dsa/locale/ug/fusiondirectory.po b/dsa/locale/ug/fusiondirectory.po
index 691e1ba53df233a5381b0399d37ae78fa8123572..e58db8d92fa7e394c8335cfed6c39cfd1a8f9716 100644
--- a/dsa/locale/ug/fusiondirectory.po
+++ b/dsa/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/vi_VN/fusiondirectory.po b/dsa/locale/vi_VN/fusiondirectory.po
index f428e98b5b4d080a4a9d0564a0a98b995b8a501c..e597603c747ae144d0ee939aa41c75c41b3d7137 100644
--- a/dsa/locale/vi_VN/fusiondirectory.po
+++ b/dsa/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/dsa/locale/zh/fusiondirectory.po b/dsa/locale/zh/fusiondirectory.po
index 7eb082cad442415ee4fde1c9782fa09ced22fcdf..f53eda15322da776ac03ac2f07524056b4d538e1 100644
--- a/dsa/locale/zh/fusiondirectory.po
+++ b/dsa/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/ejbca/locale/ar/fusiondirectory.po b/ejbca/locale/ar/fusiondirectory.po
index 56a79b3d519dc84ac3ed31f704b82525c711c153..5be0d8018edc450cba149063a51e72c3c973f1a8 100644
--- a/ejbca/locale/ar/fusiondirectory.po
+++ b/ejbca/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/ejbca/locale/ca/fusiondirectory.po b/ejbca/locale/ca/fusiondirectory.po
index e0bb0313f07f3587e2a0cd32cc0c70fc4782ea9c..ca7d2ac1b163612d6fef2fbb6dfef1901d208255 100644
--- a/ejbca/locale/ca/fusiondirectory.po
+++ b/ejbca/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/ejbca/locale/cs_CZ/fusiondirectory.po b/ejbca/locale/cs_CZ/fusiondirectory.po
index b33afff163e13694da3596e9eea488569013fad6..8d67ff4804d21bf8e3e35a53d4eefbd3bde4f894 100644
--- a/ejbca/locale/cs_CZ/fusiondirectory.po
+++ b/ejbca/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/ejbca/locale/de/fusiondirectory.po b/ejbca/locale/de/fusiondirectory.po
index 2ef04ce9d9a34ab5aaf687351e35388ec78afba9..f1d7826d5627e1f494e127db9e4596e60088a16c 100644
--- a/ejbca/locale/de/fusiondirectory.po
+++ b/ejbca/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/ejbca/locale/el_GR/fusiondirectory.po b/ejbca/locale/el_GR/fusiondirectory.po
index e0211193a5412290a8a7592133c56f20aefcfd14..082e845bf0d96271a9ad6ee699a114e029fb0b5f 100644
--- a/ejbca/locale/el_GR/fusiondirectory.po
+++ b/ejbca/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/ejbca/locale/en/fusiondirectory.po b/ejbca/locale/en/fusiondirectory.po
index 97713ce7267b8539676d508113c97d5eb2cbccb6..2f2bd75f108f8e32e3e3eb2b7b7348b1327b8d57 100644
--- a/ejbca/locale/en/fusiondirectory.po
+++ b/ejbca/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ejbca/locale/es/fusiondirectory.po b/ejbca/locale/es/fusiondirectory.po
index 980c35c6590275cc5ee299e4aeb358a591e771ef..0acf97438ea8533711d8bbb363b517d433e2a22b 100644
--- a/ejbca/locale/es/fusiondirectory.po
+++ b/ejbca/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/ejbca/locale/es_CO/fusiondirectory.po b/ejbca/locale/es_CO/fusiondirectory.po
index 88b9cc525621e93ac309a328fc189a6b3cdf135d..a21f07ca389d37037391b2dc0fd93e383819ca12 100644
--- a/ejbca/locale/es_CO/fusiondirectory.po
+++ b/ejbca/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/ejbca/locale/es_VE/fusiondirectory.po b/ejbca/locale/es_VE/fusiondirectory.po
index 01f1a072fedcad55dadd21a1b716ff3fac0359b7..fabbbaac86c9dee1fa2288456c361b80aa3f9bda 100644
--- a/ejbca/locale/es_VE/fusiondirectory.po
+++ b/ejbca/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/ejbca/locale/fa_IR/fusiondirectory.po b/ejbca/locale/fa_IR/fusiondirectory.po
index 24dc4b652d5791e30486f4036801676069320181..0b0d46b6bcd553ddb403875b1b0e4b9d8234cd13 100644
--- a/ejbca/locale/fa_IR/fusiondirectory.po
+++ b/ejbca/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/fi_FI/fusiondirectory.po b/ejbca/locale/fi_FI/fusiondirectory.po
index bf3f6ba1e2b03db98110f0d67cad99aeb9aa9bb9..71981bc99b5521ba6766847d108271df2612221f 100644
--- a/ejbca/locale/fi_FI/fusiondirectory.po
+++ b/ejbca/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/ejbca/locale/fr/fusiondirectory.po b/ejbca/locale/fr/fusiondirectory.po
index fbff3415b7c3dc08431d7faf28fc07cd7b9ce2a7..e4bed2bdf39dd6fed54cdb63ddbfe518939d6ac2 100644
--- a/ejbca/locale/fr/fusiondirectory.po
+++ b/ejbca/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: config/ejbca/class_ejbcaConfig.inc:28
 msgid "EJBCA plugin configuration"
-msgstr "Configuration du plugin EJBCA"
+msgstr "Configuration EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:29
 msgid "FusionDirectory ejbca plugin configuration"
-msgstr "Configuration du plugin ejbca FusionDirectory"
+msgstr "Configuration du plugin ejbca"
 
 #: config/ejbca/class_ejbcaConfig.inc:42
 msgid "EJBCA plugin"
@@ -32,11 +32,11 @@ msgstr "Plugin EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:45
 msgid "EJBCA RDN"
-msgstr "RDN EJBCA"
+msgstr "Branche EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:45
 msgid "Branch in which ejbca certificates are stored"
-msgstr "Branche dans laquelle sont stockés les certificats ejbca"
+msgstr "Branche dans laquelle sont stockés les certificats EJBCA"
 
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
diff --git a/ejbca/locale/hu_HU/fusiondirectory.po b/ejbca/locale/hu_HU/fusiondirectory.po
index 6be2b13dc6bb5b8b673294b9923dacffe1ba6add..b84c71957854245ea33a7ff8531bb63d5973d3f7 100644
--- a/ejbca/locale/hu_HU/fusiondirectory.po
+++ b/ejbca/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/ejbca/locale/id/fusiondirectory.po b/ejbca/locale/id/fusiondirectory.po
index d4d45957ce345c71fc63200a8d6165171acbed7d..0dd5ddbb508bc806d15a677a1d34d16661114508 100644
--- a/ejbca/locale/id/fusiondirectory.po
+++ b/ejbca/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/it_IT/fusiondirectory.po b/ejbca/locale/it_IT/fusiondirectory.po
index eada37d6c505fa117b4c3a9e9907bd593d2ed7d9..8a1145d58f13aba0c546e39673e3c62e49585ce9 100644
--- a/ejbca/locale/it_IT/fusiondirectory.po
+++ b/ejbca/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ejbca/locale/lv/fusiondirectory.po b/ejbca/locale/lv/fusiondirectory.po
index 09b4ddb7714500babb04f836e766418b634f7991..7b0ef47c80b9de3de59ff1311800f0abd9496fb7 100644
--- a/ejbca/locale/lv/fusiondirectory.po
+++ b/ejbca/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/ejbca/locale/nb/fusiondirectory.po b/ejbca/locale/nb/fusiondirectory.po
index 58f32a65f99d5d5578d9c65c206245dc00754d5d..bca3050708ca093165ad0f689a86ec316d8581bb 100644
--- a/ejbca/locale/nb/fusiondirectory.po
+++ b/ejbca/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/ejbca/locale/nl/fusiondirectory.po b/ejbca/locale/nl/fusiondirectory.po
index ba5a64c123cb81a50ba47f40104cffe5721bc0a9..93cce80d49598cb605b8af00e577540aabec977b 100644
--- a/ejbca/locale/nl/fusiondirectory.po
+++ b/ejbca/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ejbca/locale/pl/fusiondirectory.po b/ejbca/locale/pl/fusiondirectory.po
index 5303b9fd1f58271bfbc9d505c113fff9c6a4f30e..ac8b8c06adadc8afc592d8ea552d156de260670d 100644
--- a/ejbca/locale/pl/fusiondirectory.po
+++ b/ejbca/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/ejbca/class_ejbcaConfig.inc:28
 msgid "EJBCA plugin configuration"
diff --git a/ejbca/locale/pt/fusiondirectory.po b/ejbca/locale/pt/fusiondirectory.po
index 8d8601b6bbe5869e766944714c3b70726ec0d3c4..695e79dbfc814f8f8fe6b199596184c0401df9e4 100644
--- a/ejbca/locale/pt/fusiondirectory.po
+++ b/ejbca/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/ejbca/locale/pt_BR/fusiondirectory.po b/ejbca/locale/pt_BR/fusiondirectory.po
index c6e878fe7c9c5f2beb7b587ab87ee7d64aa37321..d2d656a653385430a3df0dc35100ba58ad66c76b 100644
--- a/ejbca/locale/pt_BR/fusiondirectory.po
+++ b/ejbca/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/ejbca/locale/ru/fusiondirectory.po b/ejbca/locale/ru/fusiondirectory.po
index 0c087c7271414a975767d089f820c3b78d7811f7..6b93ef4144c77c1348f31fa28fceabc05adffeda 100644
--- a/ejbca/locale/ru/fusiondirectory.po
+++ b/ejbca/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/ejbca/locale/ru@petr1708/fusiondirectory.po b/ejbca/locale/ru@petr1708/fusiondirectory.po
index 279522a0ad4b2515dcdb1219bd28cc605d939092..7c21aa9c873232a3c880fa93a2bf40eb6aa9b9e4 100644
--- a/ejbca/locale/ru@petr1708/fusiondirectory.po
+++ b/ejbca/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/sv/fusiondirectory.po b/ejbca/locale/sv/fusiondirectory.po
index fdfd55705a7f094078091a28d428b467515f8d15..a317c438b88dfcdb52f53e937ed8e88ad0393327 100644
--- a/ejbca/locale/sv/fusiondirectory.po
+++ b/ejbca/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/ejbca/locale/ug/fusiondirectory.po b/ejbca/locale/ug/fusiondirectory.po
index 89b5e98fcdb86215756acced5fd1fa346a48e2aa..a12c33815a7046a2d99d098ed5f35ef2fc7d620f 100644
--- a/ejbca/locale/ug/fusiondirectory.po
+++ b/ejbca/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/vi_VN/fusiondirectory.po b/ejbca/locale/vi_VN/fusiondirectory.po
index bb8f17a523df1bddf382e552728854455ec3e31e..408fa8ff4ae54baef47afc4057bab1e439b20ccc 100644
--- a/ejbca/locale/vi_VN/fusiondirectory.po
+++ b/ejbca/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/ejbca/locale/zh/fusiondirectory.po b/ejbca/locale/zh/fusiondirectory.po
index 50e5d0be32d9d248b577ff150fa140c09d2d5188..bd4b1aafd84bd74e3e60ab001d1a3b69fb639be5 100644
--- a/ejbca/locale/zh/fusiondirectory.po
+++ b/ejbca/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/fai/locale/ar/fusiondirectory.po b/fai/locale/ar/fusiondirectory.po
index 5ecb73a1c183172c2a4bff17e74b0e2addbe4f14..e3d286b8b7dfa7489515c9b8b38bb7397b414316 100644
--- a/fai/locale/ar/fusiondirectory.po
+++ b/fai/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/fai/locale/ca/fusiondirectory.po b/fai/locale/ca/fusiondirectory.po
index e743130c47d3e0234ffd26089e747124bc18ce21..9652a2aba3d1785efbaacc3e7aec5832aa7f746b 100644
--- a/fai/locale/ca/fusiondirectory.po
+++ b/fai/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/fai/locale/cs_CZ/fusiondirectory.po b/fai/locale/cs_CZ/fusiondirectory.po
index a0ee2e9513443d2c34ac10f5d102594f1659dbe9..a09f9a809b0e89bb88f5864ba9f485a70b6e1ac0 100644
--- a/fai/locale/cs_CZ/fusiondirectory.po
+++ b/fai/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/fai/locale/de/fusiondirectory.po b/fai/locale/de/fusiondirectory.po
index 9441524324667cb83eaf44e291606e0d26d21da2..20db4bc86ff0806573a8a8757831784971620dd3 100644
--- a/fai/locale/de/fusiondirectory.po
+++ b/fai/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/fai/locale/el_GR/fusiondirectory.po b/fai/locale/el_GR/fusiondirectory.po
index 9c16892244c62ef277bccdaae864726db9384d7e..511bd9e85eac58d99f0f25497b2c034f3a28f6de 100644
--- a/fai/locale/el_GR/fusiondirectory.po
+++ b/fai/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/fai/locale/en/fusiondirectory.po b/fai/locale/en/fusiondirectory.po
index 182d12cb110a08351a63b864ecbdcf7ba2169597..ceeafb1a24b9ef08a131439cb0b428de1b8fd6e4 100644
--- a/fai/locale/en/fusiondirectory.po
+++ b/fai/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/fai/locale/es/fusiondirectory.po b/fai/locale/es/fusiondirectory.po
index 941bea9d73f8e67899855c8a0ad0cb909aeea7b7..5e7a0bfe163719b7160cad2459551794b1ea30e1 100644
--- a/fai/locale/es/fusiondirectory.po
+++ b/fai/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/fai/locale/es_CO/fusiondirectory.po b/fai/locale/es_CO/fusiondirectory.po
index 0b20d800911455747eb8c745e869ec234e3554df..a8ec7709caebf1de6f50bec29900540b957c7d5a 100644
--- a/fai/locale/es_CO/fusiondirectory.po
+++ b/fai/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/fai/locale/es_VE/fusiondirectory.po b/fai/locale/es_VE/fusiondirectory.po
index 4f3313a5fbe49018fc6e93d532c6c9c853e60a97..502ca3bcfb0d8e865cbb772f0b5a3a7f82c27419 100644
--- a/fai/locale/es_VE/fusiondirectory.po
+++ b/fai/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/fai/locale/fa_IR/fusiondirectory.po b/fai/locale/fa_IR/fusiondirectory.po
index 7976bdf5b4ae68d79ce14f692a96a1e4f85f2444..22639a4de6478738f6135008db8a332e4af81090 100644
--- a/fai/locale/fa_IR/fusiondirectory.po
+++ b/fai/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/fai/locale/fi_FI/fusiondirectory.po b/fai/locale/fi_FI/fusiondirectory.po
index 9548e81da4ae0372397f1861445fadf2f74a7bfd..1c177937f8c11c074e77c43a10aa8dbf00383168 100644
--- a/fai/locale/fi_FI/fusiondirectory.po
+++ b/fai/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/fai/locale/fr/fusiondirectory.po b/fai/locale/fr/fusiondirectory.po
index 7e9e6419acdf4812b81b0173ed72dc8b4d42768b..ed30f2b1d175cd393d1aee50dd9bc4a906331ba2 100644
--- a/fai/locale/fr/fusiondirectory.po
+++ b/fai/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/fai/locale/hu_HU/fusiondirectory.po b/fai/locale/hu_HU/fusiondirectory.po
index 1aa5673792ac8e58cd9bfbb1e82ffa0a80c61276..c695770ad3f9d082f1f89b556e3e74f47b08c2e7 100644
--- a/fai/locale/hu_HU/fusiondirectory.po
+++ b/fai/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/fai/locale/id/fusiondirectory.po b/fai/locale/id/fusiondirectory.po
index 8d300048a54e5eff249a5c3454256d3b2986c8fb..1b7d2cc0f672a0885740240114c2b82c91b67c3e 100644
--- a/fai/locale/id/fusiondirectory.po
+++ b/fai/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/fai/locale/it_IT/fusiondirectory.po b/fai/locale/it_IT/fusiondirectory.po
index 9c70dd8a56d33b248014460c685b2344b698faf1..2c67fcf15a184b2968e582058f2f62af1d344d3b 100644
--- a/fai/locale/it_IT/fusiondirectory.po
+++ b/fai/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/fai/locale/lv/fusiondirectory.po b/fai/locale/lv/fusiondirectory.po
index a08f7b1f738eeae15b1b79d37f79b02fb34529e3..19aaf675beb59de8b4b001d82d697b62a6660711 100644
--- a/fai/locale/lv/fusiondirectory.po
+++ b/fai/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/fai/locale/nb/fusiondirectory.po b/fai/locale/nb/fusiondirectory.po
index 17463fa6b1b06748caece51fb46f218419a9ca31..9c26583b13eaf312909e586778ea9c170940afeb 100644
--- a/fai/locale/nb/fusiondirectory.po
+++ b/fai/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/fai/locale/nl/fusiondirectory.po b/fai/locale/nl/fusiondirectory.po
index 5d3f2d28832fae23cbdfb17f62dd4f37dca43b30..1642d5fb5c17a5d42b18694240739e8b6c56cc93 100644
--- a/fai/locale/nl/fusiondirectory.po
+++ b/fai/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/fai/locale/pl/fusiondirectory.po b/fai/locale/pl/fusiondirectory.po
index 9d0581b72ee0b5da7786d30a511d27ab1d964d40..8df37c6afd2e2a9ec92a0ea4bd4a4b22968314d1 100644
--- a/fai/locale/pl/fusiondirectory.po
+++ b/fai/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/fai/class_faiConfig.inc:28
 msgid "FAI configuration"
diff --git a/fai/locale/pt/fusiondirectory.po b/fai/locale/pt/fusiondirectory.po
index 322f272cbb85ceb866294f0f318de099cb24e3b8..ba0f65b76be315efc3560f2f2e934908a09288f5 100644
--- a/fai/locale/pt/fusiondirectory.po
+++ b/fai/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/fai/locale/pt_BR/fusiondirectory.po b/fai/locale/pt_BR/fusiondirectory.po
index 72a1c5d2783971605ddc6f84b00417a7b889fa54..e712edae902b0f2f2d04d4832f0407b6dd0a7b81 100644
--- a/fai/locale/pt_BR/fusiondirectory.po
+++ b/fai/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/fai/locale/ru/fusiondirectory.po b/fai/locale/ru/fusiondirectory.po
index 969718a987afde26e0c192e7120bca8aa7272d97..b04f195619e91c0d7477d8c931d527ddca4e6a8a 100644
--- a/fai/locale/ru/fusiondirectory.po
+++ b/fai/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/fai/locale/ru@petr1708/fusiondirectory.po b/fai/locale/ru@petr1708/fusiondirectory.po
index 9788c9e8c6a826ca9e0ca661202e41b09114f9f1..d4db4e11a19f9ed86bef81fd26978039be00482e 100644
--- a/fai/locale/ru@petr1708/fusiondirectory.po
+++ b/fai/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/fai/locale/sv/fusiondirectory.po b/fai/locale/sv/fusiondirectory.po
index 78fc94a7fc8ba4f9b444a3a319546b1f34fcbab4..45a9c5d19b6c91153739d322024c014ae55251f0 100644
--- a/fai/locale/sv/fusiondirectory.po
+++ b/fai/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/fai/locale/ug/fusiondirectory.po b/fai/locale/ug/fusiondirectory.po
index b320a3be57df5f53370ccf7b9dc3dd41ae3303ff..75b2d732a364b9d5fb2468a34486afe1282635bf 100644
--- a/fai/locale/ug/fusiondirectory.po
+++ b/fai/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/fai/locale/vi_VN/fusiondirectory.po b/fai/locale/vi_VN/fusiondirectory.po
index 55deb1185e81cb60eea1b04c16bae24fd7a61ddb..fd3ebb8f189b4ebd03c100675ba067a8694e13cc 100644
--- a/fai/locale/vi_VN/fusiondirectory.po
+++ b/fai/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/fai/locale/zh/fusiondirectory.po b/fai/locale/zh/fusiondirectory.po
index 1d7d4b54a03ce3bd5a3f26d1d6af7a3f0407eca2..3e3fcd320a90d2d0e1c6f042eef33d44807d7948 100644
--- a/fai/locale/zh/fusiondirectory.po
+++ b/fai/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/freeradius/locale/ar/fusiondirectory.po b/freeradius/locale/ar/fusiondirectory.po
index 8cc7ce3a6a9e1c9c45cf28f62b34fe1bf71b900b..e8fe162680aa6f9c6b75de6d2e8ec4e39216a0bb 100644
--- a/freeradius/locale/ar/fusiondirectory.po
+++ b/freeradius/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/ca/fusiondirectory.po b/freeradius/locale/ca/fusiondirectory.po
index 2634d89c4f8abc87e78599c91d95b533aa5fa6e2..629cd70cfd9037108839c71029b2e86222895c84 100644
--- a/freeradius/locale/ca/fusiondirectory.po
+++ b/freeradius/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/cs_CZ/fusiondirectory.po b/freeradius/locale/cs_CZ/fusiondirectory.po
index 1e9a9eb8e2ceb30c39d4080eefd74a9330046fb1..f7d95eec0e0502e8a470eaefb7a664ed2ad81718 100644
--- a/freeradius/locale/cs_CZ/fusiondirectory.po
+++ b/freeradius/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/freeradius/locale/de/fusiondirectory.po b/freeradius/locale/de/fusiondirectory.po
index 6d872082a0f97e779c91db8a3096554503469448..1d79a7aa8cdb7152d256fb46c05c2feba1e77a44 100644
--- a/freeradius/locale/de/fusiondirectory.po
+++ b/freeradius/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/freeradius/locale/el_GR/fusiondirectory.po b/freeradius/locale/el_GR/fusiondirectory.po
index 1866cb5fb2a3905fdbfc4b135d586d009eef64de..7f95082b0f23c5bbf91cb7757259d74a95842a99 100644
--- a/freeradius/locale/el_GR/fusiondirectory.po
+++ b/freeradius/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/freeradius/locale/en/fusiondirectory.po b/freeradius/locale/en/fusiondirectory.po
index d675fcb358e6a02aab949aafb33b12569c638341..51d407fd54dcbfccb5f1f8947dfbd8dcba5098a8 100644
--- a/freeradius/locale/en/fusiondirectory.po
+++ b/freeradius/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/freeradius/locale/es/fusiondirectory.po b/freeradius/locale/es/fusiondirectory.po
index 56a02d4d75af83f65769bbc4c39b99bbde364955..643ec4a2b38ae2291fae50e8cb88cba5b9746f83 100644
--- a/freeradius/locale/es/fusiondirectory.po
+++ b/freeradius/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/freeradius/locale/es_CO/fusiondirectory.po b/freeradius/locale/es_CO/fusiondirectory.po
index 3d643071288525d476cf152d3a8c6ee592927923..7a04e55ec28b46e6b9cb7941b683589b443d2d4f 100644
--- a/freeradius/locale/es_CO/fusiondirectory.po
+++ b/freeradius/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/freeradius/locale/es_VE/fusiondirectory.po b/freeradius/locale/es_VE/fusiondirectory.po
index 135b0740ff08adca08621107af79fc796620765c..71cf44186a2a9146cfc2570b9a15c49e52b3a49f 100644
--- a/freeradius/locale/es_VE/fusiondirectory.po
+++ b/freeradius/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/freeradius/locale/fa_IR/fusiondirectory.po b/freeradius/locale/fa_IR/fusiondirectory.po
index d0bee18668426ed5ab98d9d755aa57fbb149298b..27dc888a000cffb36dde6754cb31e8bd949dd90b 100644
--- a/freeradius/locale/fa_IR/fusiondirectory.po
+++ b/freeradius/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/fi_FI/fusiondirectory.po b/freeradius/locale/fi_FI/fusiondirectory.po
index 43c380e03bf250f7bd0fbefe11dfbc7cc9706d37..80c9ac0fa04dabf74e389b678988ec13c85b69a4 100644
--- a/freeradius/locale/fi_FI/fusiondirectory.po
+++ b/freeradius/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/freeradius/locale/fr/fusiondirectory.po b/freeradius/locale/fr/fusiondirectory.po
index 4189556509af4027804c0d7a8cd3071916270726..5e803a2f351dcc0d2dd4dabc9ac82ebda7fba492 100644
--- a/freeradius/locale/fr/fusiondirectory.po
+++ b/freeradius/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/freeradius/locale/hu_HU/fusiondirectory.po b/freeradius/locale/hu_HU/fusiondirectory.po
index 1310aece07189f356adec3e97a33acbca6058a52..d1399bb50b267badf4333e42bca0f6be0e03d4dd 100644
--- a/freeradius/locale/hu_HU/fusiondirectory.po
+++ b/freeradius/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/id/fusiondirectory.po b/freeradius/locale/id/fusiondirectory.po
index 34809b5711a966ac1e6e28694e4d3e0795d35ec0..b725ec62aa06ce78566afa815e81be72e5e8f0d6 100644
--- a/freeradius/locale/id/fusiondirectory.po
+++ b/freeradius/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/it_IT/fusiondirectory.po b/freeradius/locale/it_IT/fusiondirectory.po
index 4677ff0827f0d8f5688609806d0ee88283aaba36..8eba96c1657886ed4ca86323f059358c978a4651 100644
--- a/freeradius/locale/it_IT/fusiondirectory.po
+++ b/freeradius/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/freeradius/locale/lv/fusiondirectory.po b/freeradius/locale/lv/fusiondirectory.po
index 11f4996f4e1575ff6aaa423515953907e37547a0..f8c6d299904a4beb3950dd7187ce2a12b61c72f9 100644
--- a/freeradius/locale/lv/fusiondirectory.po
+++ b/freeradius/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/freeradius/locale/nb/fusiondirectory.po b/freeradius/locale/nb/fusiondirectory.po
index 8222214fb912e30aa578ac2ebb74605cd7df7698..2dff3f7a790810d7eb1c5c9694358173c9a47ab2 100644
--- a/freeradius/locale/nb/fusiondirectory.po
+++ b/freeradius/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/nl/fusiondirectory.po b/freeradius/locale/nl/fusiondirectory.po
index d61e7da01119fd1871bead5710948b36a4a65ef1..64281635421768f9926ecd5797dca93157e7d012 100644
--- a/freeradius/locale/nl/fusiondirectory.po
+++ b/freeradius/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/freeradius/locale/pl/fusiondirectory.po b/freeradius/locale/pl/fusiondirectory.po
index 9a6388841646d0634a71f40f828af0a4c4ce2ea4..6a11ab272c404e06403b62ee297c596152f73147 100644
--- a/freeradius/locale/pl/fusiondirectory.po
+++ b/freeradius/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/freeradius/class_freeradiusAccount.inc:35
 #: admin/freeradius/class_freeradiusGroup.inc:34
diff --git a/freeradius/locale/pt/fusiondirectory.po b/freeradius/locale/pt/fusiondirectory.po
index e0d06d7f3c40e4a9a32e3b5f0b394e70aa3368f6..fb78fa89967794bd2ffd6d052816f5396fcc4417 100644
--- a/freeradius/locale/pt/fusiondirectory.po
+++ b/freeradius/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/freeradius/locale/pt_BR/fusiondirectory.po b/freeradius/locale/pt_BR/fusiondirectory.po
index 00c689c01ea34c1b0c89f5441dc9d1eb61fc7003..2d8ad7180a100683483a53279dd540554bcb6bf9 100644
--- a/freeradius/locale/pt_BR/fusiondirectory.po
+++ b/freeradius/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/freeradius/locale/ru/fusiondirectory.po b/freeradius/locale/ru/fusiondirectory.po
index 1f7c041f53864aa15c99482f99c51f2db5b54a6a..bd8cbc8cb097542e67e1922c44ee78cbc9de312f 100644
--- a/freeradius/locale/ru/fusiondirectory.po
+++ b/freeradius/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/freeradius/locale/ru@petr1708/fusiondirectory.po b/freeradius/locale/ru@petr1708/fusiondirectory.po
index 3df1e77142e3346d76e0465665df41e6da68d3f3..07e04fdfae8066ecbbb51ad17512a55ccc3268ea 100644
--- a/freeradius/locale/ru@petr1708/fusiondirectory.po
+++ b/freeradius/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/sv/fusiondirectory.po b/freeradius/locale/sv/fusiondirectory.po
index 1e128abaab6fa0efb583888f804158dde00f0c5f..4beff6ef83b59c540f9b5c49097504a0fa9446bb 100644
--- a/freeradius/locale/sv/fusiondirectory.po
+++ b/freeradius/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/freeradius/locale/ug/fusiondirectory.po b/freeradius/locale/ug/fusiondirectory.po
index 60f4ad448ff58b94229f13039007bd6fe6842787..b39562c6303a28408b8e87f8ba76e72b02c488c8 100644
--- a/freeradius/locale/ug/fusiondirectory.po
+++ b/freeradius/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/vi_VN/fusiondirectory.po b/freeradius/locale/vi_VN/fusiondirectory.po
index e908f0c65caeac9af2bb3ead05f4d7fddeafe237..d4a40158de97d15a4ab2661017e36bf6820030e0 100644
--- a/freeradius/locale/vi_VN/fusiondirectory.po
+++ b/freeradius/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/freeradius/locale/zh/fusiondirectory.po b/freeradius/locale/zh/fusiondirectory.po
index e790e5fd3f5c11dd21288e8753f8a0fb0a2d8bef..26ac7d1a8c379e9ef839029a6e5b38e3fca3407e 100644
--- a/freeradius/locale/zh/fusiondirectory.po
+++ b/freeradius/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/fusioninventory/locale/ar/fusiondirectory.po b/fusioninventory/locale/ar/fusiondirectory.po
index 29e6e0b866cac56862e7ce7abd6c605476686b1e..b89dc0f519c06e2c08393ee00e423783b1f9fb19 100644
--- a/fusioninventory/locale/ar/fusiondirectory.po
+++ b/fusioninventory/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/fusioninventory/locale/ca/fusiondirectory.po b/fusioninventory/locale/ca/fusiondirectory.po
index c77989b38adb3bdcbf8571eb7a11fcbdb077a075..e98eab5e243e45afcd994862367548747211b53d 100644
--- a/fusioninventory/locale/ca/fusiondirectory.po
+++ b/fusioninventory/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/fusioninventory/locale/cs_CZ/fusiondirectory.po b/fusioninventory/locale/cs_CZ/fusiondirectory.po
index aaeaba43d5b1375c5b9786e1dba0c2e66f91f1f4..53b2ef5549ea7f84927eb9c7a5ab7f645038cc61 100644
--- a/fusioninventory/locale/cs_CZ/fusiondirectory.po
+++ b/fusioninventory/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/fusioninventory/locale/de/fusiondirectory.po b/fusioninventory/locale/de/fusiondirectory.po
index 5653a8276fc173a2c03599d82a8ddfec6f50a633..938b46bdaeb3f2be147e9407f8d92e4f5edee428 100644
--- a/fusioninventory/locale/de/fusiondirectory.po
+++ b/fusioninventory/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/fusioninventory/locale/el_GR/fusiondirectory.po b/fusioninventory/locale/el_GR/fusiondirectory.po
index 17b55b377cd88ff93521e8b43fb1fe8340dae7d9..32f5639f8b37f6961f7f24cc74bc427882265aab 100644
--- a/fusioninventory/locale/el_GR/fusiondirectory.po
+++ b/fusioninventory/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/fusioninventory/locale/en/fusiondirectory.po b/fusioninventory/locale/en/fusiondirectory.po
index b1951d68dd8719ab520088d40cd79f0b8216fee9..5afae78c5f05ff052d36c47b2bc749e54c1bf04f 100644
--- a/fusioninventory/locale/en/fusiondirectory.po
+++ b/fusioninventory/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/fusioninventory/locale/es/fusiondirectory.po b/fusioninventory/locale/es/fusiondirectory.po
index 75a4be098a9f81c1497e731190f63a84966e39cf..4abbea051f3cf66c58f99be2bb508337a0625a03 100644
--- a/fusioninventory/locale/es/fusiondirectory.po
+++ b/fusioninventory/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/fusioninventory/locale/es_CO/fusiondirectory.po b/fusioninventory/locale/es_CO/fusiondirectory.po
index 45c60ca3251a7e34c22159ee2b0f6892f9c3d65d..28a8c21821627e4c742908991c740b97fe7666b1 100644
--- a/fusioninventory/locale/es_CO/fusiondirectory.po
+++ b/fusioninventory/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/fusioninventory/locale/es_VE/fusiondirectory.po b/fusioninventory/locale/es_VE/fusiondirectory.po
index 094fbf1c5ce6ed76294dc9dc36422c188c4ffb7f..680be4748358b53029444d725f1e166678277074 100644
--- a/fusioninventory/locale/es_VE/fusiondirectory.po
+++ b/fusioninventory/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/fusioninventory/locale/fa_IR/fusiondirectory.po b/fusioninventory/locale/fa_IR/fusiondirectory.po
index 781635196a35cee38bafb434dcda31bdd7d1d311..b164d20ea0a2c64d778174a09e5f1690c82643bb 100644
--- a/fusioninventory/locale/fa_IR/fusiondirectory.po
+++ b/fusioninventory/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/fusioninventory/locale/fi_FI/fusiondirectory.po b/fusioninventory/locale/fi_FI/fusiondirectory.po
index 07ec28bd564b63b66e7186a1c4397d916a8d060a..fe74ab8d26cddf8d0f84f1195473f6289b87792c 100644
--- a/fusioninventory/locale/fi_FI/fusiondirectory.po
+++ b/fusioninventory/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/fusioninventory/locale/fr/fusiondirectory.po b/fusioninventory/locale/fr/fusiondirectory.po
index ee3e5c006455a9636f7a90c37fc154683e33710f..e2a1d8588e5450f149f26475686ab4ecc68fd3eb 100644
--- a/fusioninventory/locale/fr/fusiondirectory.po
+++ b/fusioninventory/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/fusioninventory/locale/hu_HU/fusiondirectory.po b/fusioninventory/locale/hu_HU/fusiondirectory.po
index 899073677177850910577c42f4b5153ff4f7aeb6..d35b24d9ffcac927c5289fb6746995acd4bd71aa 100644
--- a/fusioninventory/locale/hu_HU/fusiondirectory.po
+++ b/fusioninventory/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/fusioninventory/locale/id/fusiondirectory.po b/fusioninventory/locale/id/fusiondirectory.po
index 840924eb7fd67e45a000a5d3f19cdfdd9ccd2d38..10829114d3c7b02b4d0fe60f28b844c64d621e84 100644
--- a/fusioninventory/locale/id/fusiondirectory.po
+++ b/fusioninventory/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/fusioninventory/locale/it_IT/fusiondirectory.po b/fusioninventory/locale/it_IT/fusiondirectory.po
index 42ea52cc23d6df7f3d5497c85a041d4e3da1fbf5..fddf080a771e11af6ca26e9af308774e5ed135d2 100644
--- a/fusioninventory/locale/it_IT/fusiondirectory.po
+++ b/fusioninventory/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/fusioninventory/locale/lv/fusiondirectory.po b/fusioninventory/locale/lv/fusiondirectory.po
index 1452b680dc8d273499e6a0f0e531e76d60c41d5b..9c85345ec69508e0d23a695f495bb6394a17b187 100644
--- a/fusioninventory/locale/lv/fusiondirectory.po
+++ b/fusioninventory/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/fusioninventory/locale/nb/fusiondirectory.po b/fusioninventory/locale/nb/fusiondirectory.po
index 9202b1d291a89e087ad9337cbf565a3f47f26c52..a5a7a1261d5198b91fb2670d448d563ba1c49b21 100644
--- a/fusioninventory/locale/nb/fusiondirectory.po
+++ b/fusioninventory/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/fusioninventory/locale/nl/fusiondirectory.po b/fusioninventory/locale/nl/fusiondirectory.po
index 20b68263d82d9390257012826b1123fb46ee2c64..ee2fe34f1f113bba7ad491ea75a8355c1ed94503 100644
--- a/fusioninventory/locale/nl/fusiondirectory.po
+++ b/fusioninventory/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/fusioninventory/locale/pl/fusiondirectory.po b/fusioninventory/locale/pl/fusiondirectory.po
index 0c5b8c99f6cb921475629b19c933349977c276e0..6ae7f961b5925e3d85a4ce6dfeb7ee7eeb577c80 100644
--- a/fusioninventory/locale/pl/fusiondirectory.po
+++ b/fusioninventory/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/fusioninventory/class_fiConfig.inc:28
 msgid "FusionInventory configuration"
diff --git a/fusioninventory/locale/pt/fusiondirectory.po b/fusioninventory/locale/pt/fusiondirectory.po
index 2793ed494f28dc6b39d69c043ad49294e8c957ef..b5a42a24a46920d949c2a14274baa2067c4c904e 100644
--- a/fusioninventory/locale/pt/fusiondirectory.po
+++ b/fusioninventory/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/fusioninventory/locale/pt_BR/fusiondirectory.po b/fusioninventory/locale/pt_BR/fusiondirectory.po
index 7f0a224ff233ef73e774319b90e80e7be4bb71be..282dc58e6935de9e7e11c91ff017431e321948dc 100644
--- a/fusioninventory/locale/pt_BR/fusiondirectory.po
+++ b/fusioninventory/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/fusioninventory/locale/ru/fusiondirectory.po b/fusioninventory/locale/ru/fusiondirectory.po
index 3e1d08e4acc7f45b7af42b80f53a420dacd37ed1..d375b489791253575a276a426ce6e9f9c09a433b 100644
--- a/fusioninventory/locale/ru/fusiondirectory.po
+++ b/fusioninventory/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/fusioninventory/locale/ru@petr1708/fusiondirectory.po b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
index 68847bdb60002cc2e76ddb8f1d062adc139cf41c..0529a95e3e39b1c7d20a54021c5e1a4eac5e3d3d 100644
--- a/fusioninventory/locale/ru@petr1708/fusiondirectory.po
+++ b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/fusioninventory/locale/sv/fusiondirectory.po b/fusioninventory/locale/sv/fusiondirectory.po
index 5285a7521a356023def43a24dc92e400f751cc8a..91d6d80c3a869a14deb9333831c516aa6d8da6f0 100644
--- a/fusioninventory/locale/sv/fusiondirectory.po
+++ b/fusioninventory/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/fusioninventory/locale/ug/fusiondirectory.po b/fusioninventory/locale/ug/fusiondirectory.po
index 42ccba8a9209005c3b33061d6b26e135fa98d729..b7136e0d57caadcdef24afec75cce6ca4881ac8c 100644
--- a/fusioninventory/locale/ug/fusiondirectory.po
+++ b/fusioninventory/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/fusioninventory/locale/vi_VN/fusiondirectory.po b/fusioninventory/locale/vi_VN/fusiondirectory.po
index 7d2d675282b8653e049906e0fe25d5243661a8d1..75158ec733c02ea7de7d08124de3e17304cf4a84 100644
--- a/fusioninventory/locale/vi_VN/fusiondirectory.po
+++ b/fusioninventory/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/fusioninventory/locale/zh/fusiondirectory.po b/fusioninventory/locale/zh/fusiondirectory.po
index d6db6ae1bb272079436bf630a7f1711de1658734..f3ba166752513ce23c78462fe58bde87a8949c1e 100644
--- a/fusioninventory/locale/zh/fusiondirectory.po
+++ b/fusioninventory/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/gpg/locale/ar/fusiondirectory.po b/gpg/locale/ar/fusiondirectory.po
index 9aeaa210c30acd9e13adf5d2f17fe00c4f74c98f..f0f29d8e09ebae6fd1b8515242444076f3c6b5a3 100644
--- a/gpg/locale/ar/fusiondirectory.po
+++ b/gpg/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/gpg/locale/ca/fusiondirectory.po b/gpg/locale/ca/fusiondirectory.po
index 5795b79ed8336b350d159eee82bb4ef489825a69..450bf7badd5cc48ba8869877ef00e1232d00cea5 100644
--- a/gpg/locale/ca/fusiondirectory.po
+++ b/gpg/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/gpg/locale/cs_CZ/fusiondirectory.po b/gpg/locale/cs_CZ/fusiondirectory.po
index d08b551b5fb93b62310d9f59138ace4e13c3fc28..4f4bce89df32ea478553f0b3d609cae0b773523d 100644
--- a/gpg/locale/cs_CZ/fusiondirectory.po
+++ b/gpg/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/gpg/locale/de/fusiondirectory.po b/gpg/locale/de/fusiondirectory.po
index 2f299fcc1773fce5648567e03c221958a98d203a..bbddd0b82f71f7b40eaa91cc7e423e81efc7dc8b 100644
--- a/gpg/locale/de/fusiondirectory.po
+++ b/gpg/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/gpg/locale/el_GR/fusiondirectory.po b/gpg/locale/el_GR/fusiondirectory.po
index ed8c82afa515b0db4133fb3a68db80cb98ac86a0..bacf252163c8cadc946425106bacbc1ddd2f00c3 100644
--- a/gpg/locale/el_GR/fusiondirectory.po
+++ b/gpg/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/gpg/locale/en/fusiondirectory.po b/gpg/locale/en/fusiondirectory.po
index 9f06dacbbd25b554bab6f54d5e9c6437b79d157d..d25139b6daf766f5f917f1d18f42ba33a290c781 100644
--- a/gpg/locale/en/fusiondirectory.po
+++ b/gpg/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/gpg/locale/es/fusiondirectory.po b/gpg/locale/es/fusiondirectory.po
index 15cb93eb98e56ad72161f65dad7d25bf17e0055f..fc03b83692cfcc08cdecb0227d3547e71f7332ba 100644
--- a/gpg/locale/es/fusiondirectory.po
+++ b/gpg/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/gpg/locale/es_CO/fusiondirectory.po b/gpg/locale/es_CO/fusiondirectory.po
index cf15b3eeeb6065344a8e2c40933aa17ecde1bfea..003181a958ae9386feddcb913e68556a09c25825 100644
--- a/gpg/locale/es_CO/fusiondirectory.po
+++ b/gpg/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/gpg/locale/es_VE/fusiondirectory.po b/gpg/locale/es_VE/fusiondirectory.po
index ba123d691e2fa982b30bc2bedd835617cd7df101..a40c19857c70ce578ff97425f230993ca0e613ec 100644
--- a/gpg/locale/es_VE/fusiondirectory.po
+++ b/gpg/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/gpg/locale/fa_IR/fusiondirectory.po b/gpg/locale/fa_IR/fusiondirectory.po
index f093400ae9e10ca606788ddeaceb644a9d847a30..e4988e7bbbb954d9a6ce75af88f0dd3ab7e4d258 100644
--- a/gpg/locale/fa_IR/fusiondirectory.po
+++ b/gpg/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/fi_FI/fusiondirectory.po b/gpg/locale/fi_FI/fusiondirectory.po
index c28c461936c26752f7493f671e9eab2a293591d4..a7358e95a7587ed5c84b1bc42609f54a40566ccd 100644
--- a/gpg/locale/fi_FI/fusiondirectory.po
+++ b/gpg/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/gpg/locale/fr/fusiondirectory.po b/gpg/locale/fr/fusiondirectory.po
index f11ad7e15d23550b0c6eb69387adb0a98190b433..3d9bc4457ba3546706cc53e8db0b80b601dc7f8b 100644
--- a/gpg/locale/fr/fusiondirectory.po
+++ b/gpg/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: personal/gpg/class_gpgAccount.inc:31
 msgid "GPG keys"
-msgstr "Clefs GPG"
+msgstr "Clés GPG"
 
 #: personal/gpg/class_gpgAccount.inc:35
 msgid "GPG keys of this user"
-msgstr "Liste des clefs GPG publiques pour cet utilisateur"
+msgstr "Liste des clés GPG de cet utilisateur"
 
 #: personal/gpg/class_gpgAccount.inc:46
 msgid "GPG"
diff --git a/gpg/locale/hu_HU/fusiondirectory.po b/gpg/locale/hu_HU/fusiondirectory.po
index d1cbba53663e288f0c8a4e8482043243896bb594..1e16f50f8caedc456617d9533adc8902a854f032 100644
--- a/gpg/locale/hu_HU/fusiondirectory.po
+++ b/gpg/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/id/fusiondirectory.po b/gpg/locale/id/fusiondirectory.po
index ccb25b35ff3674058bff0d9666300e02b2fe7617..3b5b12de7245fad256b40059f1ff4bf9a668be32 100644
--- a/gpg/locale/id/fusiondirectory.po
+++ b/gpg/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/it_IT/fusiondirectory.po b/gpg/locale/it_IT/fusiondirectory.po
index 08a1a13617228c6e5ee50913c1175336ec2dea68..62615992344bfbaf950a5b3b928cab68f936faf2 100644
--- a/gpg/locale/it_IT/fusiondirectory.po
+++ b/gpg/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/gpg/locale/lv/fusiondirectory.po b/gpg/locale/lv/fusiondirectory.po
index b6c9b29c011fe14d530673ea465369acc47cb5e8..a1be4de67a46ee4d202d7385881238086fbff369 100644
--- a/gpg/locale/lv/fusiondirectory.po
+++ b/gpg/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/gpg/locale/nb/fusiondirectory.po b/gpg/locale/nb/fusiondirectory.po
index 65efdbb17e4493901ecd273f21db78873d3ccfae..5c9142825c498a2efbd21ee5fa7f093386df9c6b 100644
--- a/gpg/locale/nb/fusiondirectory.po
+++ b/gpg/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/gpg/locale/nl/fusiondirectory.po b/gpg/locale/nl/fusiondirectory.po
index 573750518656afe93cf46135b437fe3dbee2cb24..b0d4fcd2f57e082a21b2b99e26473fce8e5794b2 100644
--- a/gpg/locale/nl/fusiondirectory.po
+++ b/gpg/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/gpg/locale/pl/fusiondirectory.po b/gpg/locale/pl/fusiondirectory.po
index 7a96ecb5925a6b16bf0e5b7509514731b3bbadeb..e8016c4c7f68ead3964071a5062719e78cfc23cf 100644
--- a/gpg/locale/pl/fusiondirectory.po
+++ b/gpg/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/gpg/class_gpgAccount.inc:31
 msgid "GPG keys"
diff --git a/gpg/locale/pt/fusiondirectory.po b/gpg/locale/pt/fusiondirectory.po
index 7bca815f8453d0a93943cc70c1676b8cbb6f2afd..6be5a290717594f37bd31c1c877bcc0072ab10b1 100644
--- a/gpg/locale/pt/fusiondirectory.po
+++ b/gpg/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/gpg/locale/pt_BR/fusiondirectory.po b/gpg/locale/pt_BR/fusiondirectory.po
index c435d8b9289017710f1fb53d3f3187a249f106b5..fe5f8c6d9a944a7f78a59037633e8f36b11b7576 100644
--- a/gpg/locale/pt_BR/fusiondirectory.po
+++ b/gpg/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/gpg/locale/ru/fusiondirectory.po b/gpg/locale/ru/fusiondirectory.po
index eedf3e6b2e5498079d787c3c5e4ff19d40429fc6..2da64673d05cd849e520308ccf3820c02bc9064e 100644
--- a/gpg/locale/ru/fusiondirectory.po
+++ b/gpg/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/gpg/locale/ru@petr1708/fusiondirectory.po b/gpg/locale/ru@petr1708/fusiondirectory.po
index b08724e2d1aac66d121581bdb8cf44bf8f271861..091c816372a2b241a01fb10a4e6a0035370b2540 100644
--- a/gpg/locale/ru@petr1708/fusiondirectory.po
+++ b/gpg/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/sv/fusiondirectory.po b/gpg/locale/sv/fusiondirectory.po
index 627e02e2205c4681f0dd03298902c063c0cac264..cf69fef060f67220ac3be0cc679eb3467e7fba3b 100644
--- a/gpg/locale/sv/fusiondirectory.po
+++ b/gpg/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/gpg/locale/ug/fusiondirectory.po b/gpg/locale/ug/fusiondirectory.po
index e5415f19620465ccf6dbb876e9fd3d19f73b76fd..17577d41680979eda4ecf278c510526e5c0ce8f3 100644
--- a/gpg/locale/ug/fusiondirectory.po
+++ b/gpg/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/vi_VN/fusiondirectory.po b/gpg/locale/vi_VN/fusiondirectory.po
index aae0f78499082423927e3d48748617cc541d61e8..6ef314c57f4d555414e41b40ba2192a47982764f 100644
--- a/gpg/locale/vi_VN/fusiondirectory.po
+++ b/gpg/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/gpg/locale/zh/fusiondirectory.po b/gpg/locale/zh/fusiondirectory.po
index e0c9cf6686e176bb2dca91fc670c7e2f2e4b23f4..6acb8655590b52a3a615338bb46608ec27496ad5 100644
--- a/gpg/locale/zh/fusiondirectory.po
+++ b/gpg/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/ipmi/locale/ar/fusiondirectory.po b/ipmi/locale/ar/fusiondirectory.po
index 1a602072501e1187a2e0a51e8600d1cd3c906615..039066776462499e73bbdc53bc8880ad32247f60 100644
--- a/ipmi/locale/ar/fusiondirectory.po
+++ b/ipmi/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/ca/fusiondirectory.po b/ipmi/locale/ca/fusiondirectory.po
index fae0766ad9f0d18fa8eead5692221cc7992172d5..fde627f3ea08d75350b4e4101a64dd9c1db6e153 100644
--- a/ipmi/locale/ca/fusiondirectory.po
+++ b/ipmi/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/cs_CZ/fusiondirectory.po b/ipmi/locale/cs_CZ/fusiondirectory.po
index fc1968589066ead2145217f38fc00cfcaf109d77..73f1195514dae0a40eaba0d1d173bc9b0669d020 100644
--- a/ipmi/locale/cs_CZ/fusiondirectory.po
+++ b/ipmi/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/ipmi/locale/de/fusiondirectory.po b/ipmi/locale/de/fusiondirectory.po
index 31a51e4de68991311c4f250d4d55cf764bbe23b6..66aeb894cc3f39b97f8ce9bfdbf0119c20f74f7d 100644
--- a/ipmi/locale/de/fusiondirectory.po
+++ b/ipmi/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/ipmi/locale/el_GR/fusiondirectory.po b/ipmi/locale/el_GR/fusiondirectory.po
index f47d6647fd683a50f02370a7ba30910c227a7a4a..7a16b01b1db4e95625982b33c11fade17f815278 100644
--- a/ipmi/locale/el_GR/fusiondirectory.po
+++ b/ipmi/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/ipmi/locale/en/fusiondirectory.po b/ipmi/locale/en/fusiondirectory.po
index f5bdf741a2fae35242cdf969bcccc73be73205f0..973caa28eb79baf4b818d4489f7459c44d384477 100644
--- a/ipmi/locale/en/fusiondirectory.po
+++ b/ipmi/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ipmi/locale/es/fusiondirectory.po b/ipmi/locale/es/fusiondirectory.po
index f7f221d71d0f920bdf69039e06e71e0633ae512c..d763abef44c70702a3693aa19640d2f946616a0b 100644
--- a/ipmi/locale/es/fusiondirectory.po
+++ b/ipmi/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/ipmi/locale/es_CO/fusiondirectory.po b/ipmi/locale/es_CO/fusiondirectory.po
index e56aaac165d07e1cbeb38aef7dc563d092795b8f..d58d6e495dd32af6d1cac8262b4e5fb7f8e8dfcd 100644
--- a/ipmi/locale/es_CO/fusiondirectory.po
+++ b/ipmi/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/es_VE/fusiondirectory.po b/ipmi/locale/es_VE/fusiondirectory.po
index 314548e252870503281fe9cd2687df5e2ad2838f..f09bfe1f724db6c64e8eb7736b36ebf408eee6d5 100644
--- a/ipmi/locale/es_VE/fusiondirectory.po
+++ b/ipmi/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/ipmi/locale/fa_IR/fusiondirectory.po b/ipmi/locale/fa_IR/fusiondirectory.po
index cef2c306ae08aba7e5104e9e3cd1a41050e7db15..991f28923a2798f6a376b6c650b9c5299a5ff543 100644
--- a/ipmi/locale/fa_IR/fusiondirectory.po
+++ b/ipmi/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/fi_FI/fusiondirectory.po b/ipmi/locale/fi_FI/fusiondirectory.po
index 408ea4d924803735f381ff714ace427184e162ea..ba0636f5f5a882c3fa0955f8b08b3b183a473b52 100644
--- a/ipmi/locale/fi_FI/fusiondirectory.po
+++ b/ipmi/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/fr/fusiondirectory.po b/ipmi/locale/fr/fusiondirectory.po
index 609018222cdfdf63aca6c8a494f2a5fc3bdbcf60..f8c6f16020d33f7deafe7a5bccdedeba810921a9 100644
--- a/ipmi/locale/fr/fusiondirectory.po
+++ b/ipmi/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +24,11 @@ msgstr "Client IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:32
 msgid "Edit IPMI client settings"
-msgstr "Édition des paramètres du client IPMI"
+msgstr "Éditer les paramètres du client IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:45
 msgid "IPMI client settings"
-msgstr "Édition des paramètres du client IPMI"
+msgstr "Paramètres du client IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP"
@@ -40,11 +40,11 @@ msgstr "Adresse IP de l'interface IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "User login"
-msgstr "compte Utilisateur"
+msgstr "Identifiant utilisateur"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "IPMI user login"
-msgstr "Compte utililisateur pour IPMI"
+msgstr "Identifiant de l’utilisateur IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "User password"
@@ -52,4 +52,4 @@ msgstr "Mot de passe"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "IPMI user password"
-msgstr "Mot de passe utilisateur"
+msgstr "Mot de passe de l’utilisateur IPMI"
diff --git a/ipmi/locale/hu_HU/fusiondirectory.po b/ipmi/locale/hu_HU/fusiondirectory.po
index 91b756584c04f24ba3833f74a5f13e350c321ce6..5c3c042e599d6b68192415cf0a70f2981035141a 100644
--- a/ipmi/locale/hu_HU/fusiondirectory.po
+++ b/ipmi/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/id/fusiondirectory.po b/ipmi/locale/id/fusiondirectory.po
index f4c58d8cf5a527929b782bc0d86e5e384130783c..44d93634a0de0d1c8c47d4ab8c44b3c42795d17a 100644
--- a/ipmi/locale/id/fusiondirectory.po
+++ b/ipmi/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/it_IT/fusiondirectory.po b/ipmi/locale/it_IT/fusiondirectory.po
index 25aa1c0709878e73782b572d158cd8914372ac98..7db0e818ad21da744fd3b4d7af7a23488d391c5b 100644
--- a/ipmi/locale/it_IT/fusiondirectory.po
+++ b/ipmi/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ipmi/locale/lv/fusiondirectory.po b/ipmi/locale/lv/fusiondirectory.po
index 0420d43ce52e8025c589a49e670a6ff2842d4ce9..f237bcdaaadb2b703725162f254b2984ca51251b 100644
--- a/ipmi/locale/lv/fusiondirectory.po
+++ b/ipmi/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/nb/fusiondirectory.po b/ipmi/locale/nb/fusiondirectory.po
index 33f75a8e5b1d1b1ffd1363dced803c1323894bfd..1676268ce2e712dedff00a274f437a01b47618ea 100644
--- a/ipmi/locale/nb/fusiondirectory.po
+++ b/ipmi/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/nl/fusiondirectory.po b/ipmi/locale/nl/fusiondirectory.po
index 555588c8fbdb2a6abaccfe14cb10ee0405c96088..11bc4622a1258abf9764ee2316290bb24a8bf726 100644
--- a/ipmi/locale/nl/fusiondirectory.po
+++ b/ipmi/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ipmi/locale/pl/fusiondirectory.po b/ipmi/locale/pl/fusiondirectory.po
index 7ca88b8dc4f63ef36e15d41a78c7ecda4cf1b3ef..b9a55a29ed3ecb05cc3967fb6c7ce3b50ee6c1fd 100644
--- a/ipmi/locale/pl/fusiondirectory.po
+++ b/ipmi/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
diff --git a/ipmi/locale/pt/fusiondirectory.po b/ipmi/locale/pt/fusiondirectory.po
index 42d1f27c361fe5faadab81334015c65effb396f1..94c96a1e23e3e932adc68b4a35c5d99bf0dcc4d2 100644
--- a/ipmi/locale/pt/fusiondirectory.po
+++ b/ipmi/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/pt_BR/fusiondirectory.po b/ipmi/locale/pt_BR/fusiondirectory.po
index 29ff87d5b94043c15a7b2f98911bd8bdefe8769d..ce68aa0b772c125bf08738e99bd8da6ce712edfa 100644
--- a/ipmi/locale/pt_BR/fusiondirectory.po
+++ b/ipmi/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/ipmi/locale/ru/fusiondirectory.po b/ipmi/locale/ru/fusiondirectory.po
index 1bf04e39c4e384482983932b7f8011de6a024d02..86c717510b25f13ab14b561d4717da2e761dedb5 100644
--- a/ipmi/locale/ru/fusiondirectory.po
+++ b/ipmi/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/ipmi/locale/ru@petr1708/fusiondirectory.po b/ipmi/locale/ru@petr1708/fusiondirectory.po
index 58f929de640aaaf66c5fda1a9a005f6163109796..eedc2672c4b6895d124075c157dc294331bcce44 100644
--- a/ipmi/locale/ru@petr1708/fusiondirectory.po
+++ b/ipmi/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/sv/fusiondirectory.po b/ipmi/locale/sv/fusiondirectory.po
index 423223fcb4b068a376cf9e1888f1bf60f4e71d0e..6e3987322bba63e1de18aa6c53cd0c11af32347e 100644
--- a/ipmi/locale/sv/fusiondirectory.po
+++ b/ipmi/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/ug/fusiondirectory.po b/ipmi/locale/ug/fusiondirectory.po
index 2709c79ef77d2dab986a981c8b5629eb145e92b8..a3262c53a873589c6a96bc14c741cba4a7a7c83e 100644
--- a/ipmi/locale/ug/fusiondirectory.po
+++ b/ipmi/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/vi_VN/fusiondirectory.po b/ipmi/locale/vi_VN/fusiondirectory.po
index 3e8f2195bc6649146bbdd1630091b1f70a27e1fe..c4d3a2bd5d964deba7c0359767b671d3cd85b1c5 100644
--- a/ipmi/locale/vi_VN/fusiondirectory.po
+++ b/ipmi/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/zh/fusiondirectory.po b/ipmi/locale/zh/fusiondirectory.po
index 29ed2ba316c1c13fb6fbae225c809734a38d6b0d..a5bf7da0151d9b5f0e94ba5339864ba447d54dfe 100644
--- a/ipmi/locale/zh/fusiondirectory.po
+++ b/ipmi/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/ar/fusiondirectory.po b/ldapdump/locale/ar/fusiondirectory.po
index 61b4d53c7e95c2828d88e5fe601ec47dc92a9586..6e9a799f55ec5147f62ca59ba56a0284b46d26b5 100644
--- a/ldapdump/locale/ar/fusiondirectory.po
+++ b/ldapdump/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/ca/fusiondirectory.po b/ldapdump/locale/ca/fusiondirectory.po
index 9c35fe09cfaaf6b5ee6f023e13fcbc10e8571dd8..2aabc9a42f55415de326c6d315ccc9060568e304 100644
--- a/ldapdump/locale/ca/fusiondirectory.po
+++ b/ldapdump/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/cs_CZ/fusiondirectory.po b/ldapdump/locale/cs_CZ/fusiondirectory.po
index 6ce5bf92990dca6b37bb9852557e29beca776d24..14176568ed4edf76227ec6278d5b3fdb3e975a95 100644
--- a/ldapdump/locale/cs_CZ/fusiondirectory.po
+++ b/ldapdump/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/ldapdump/locale/de/fusiondirectory.po b/ldapdump/locale/de/fusiondirectory.po
index 80048f2f622cd1c7ab9180820b488fbcbc1b0bee..3fd95c3feeb52495193f8c29406839ae5d173017 100644
--- a/ldapdump/locale/de/fusiondirectory.po
+++ b/ldapdump/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/ldapdump/locale/el_GR/fusiondirectory.po b/ldapdump/locale/el_GR/fusiondirectory.po
index c960398c65e27f45214120d29ce95ff5c7cf0038..59d3fcc69da44dbffaf777dead571142a71d6578 100644
--- a/ldapdump/locale/el_GR/fusiondirectory.po
+++ b/ldapdump/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/ldapdump/locale/en/fusiondirectory.po b/ldapdump/locale/en/fusiondirectory.po
index b542a791b22ae49cd826cea453bbc8085c66891e..1a6a72708f70424def035a99ac130b833e26a8dc 100644
--- a/ldapdump/locale/en/fusiondirectory.po
+++ b/ldapdump/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ldapdump/locale/es/fusiondirectory.po b/ldapdump/locale/es/fusiondirectory.po
index a7e97c101dfb1da80d190c2ffaa87803da4448f6..674b4b8521d9304faf7e2b68e9c91f5fc3e2d26d 100644
--- a/ldapdump/locale/es/fusiondirectory.po
+++ b/ldapdump/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/ldapdump/locale/es_CO/fusiondirectory.po b/ldapdump/locale/es_CO/fusiondirectory.po
index b2a1bfedb62ccbabf3f30a78b63b71ad4d1048c7..a9fdaf3ddf08df1f827e55d09ee862f056145001 100644
--- a/ldapdump/locale/es_CO/fusiondirectory.po
+++ b/ldapdump/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/es_VE/fusiondirectory.po b/ldapdump/locale/es_VE/fusiondirectory.po
index c6922042e9aaccb83ed929276bce01e55fc40b7b..c910e88b1a29f42eaa98f8c631f087114c18a570 100644
--- a/ldapdump/locale/es_VE/fusiondirectory.po
+++ b/ldapdump/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/ldapdump/locale/fa_IR/fusiondirectory.po b/ldapdump/locale/fa_IR/fusiondirectory.po
index 0ff384258614da1368ded7e31a762ef2b027739c..7e6e40fbb685b66a4d1619026fd03fde4a73a971 100644
--- a/ldapdump/locale/fa_IR/fusiondirectory.po
+++ b/ldapdump/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/fi_FI/fusiondirectory.po b/ldapdump/locale/fi_FI/fusiondirectory.po
index b458c2f5992010ca3d16a9da034852a69d0d2b78..cc38cf725fc1fcd946e3bd1b344fea0299abf2eb 100644
--- a/ldapdump/locale/fi_FI/fusiondirectory.po
+++ b/ldapdump/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/fr/fusiondirectory.po b/ldapdump/locale/fr/fusiondirectory.po
index d54f25b2a15349a0e274acfaf175ffc90ee229fa..8e600ad3242bd8cb7d73a387ffb43c1661da0156 100644
--- a/ldapdump/locale/fr/fusiondirectory.po
+++ b/ldapdump/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/ldapdump/locale/hu_HU/fusiondirectory.po b/ldapdump/locale/hu_HU/fusiondirectory.po
index 54ea9d3dd8d9cd8df8cb8dab6dbe8bbab28b31fd..e3d59ed1516d6b38daa810f5b47d1e3f380bc88c 100644
--- a/ldapdump/locale/hu_HU/fusiondirectory.po
+++ b/ldapdump/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/id/fusiondirectory.po b/ldapdump/locale/id/fusiondirectory.po
index eb946d8a29a31031289a4141b34c435589fe7220..aac9cb6ab95cbd3bc100cf5b07296371f2a340fe 100644
--- a/ldapdump/locale/id/fusiondirectory.po
+++ b/ldapdump/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/it_IT/fusiondirectory.po b/ldapdump/locale/it_IT/fusiondirectory.po
index 073fdbde25aacdea8c3af7107afc7020a32f894c..24569228fdd411da087545faac2663b36353c7e4 100644
--- a/ldapdump/locale/it_IT/fusiondirectory.po
+++ b/ldapdump/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ldapdump/locale/lv/fusiondirectory.po b/ldapdump/locale/lv/fusiondirectory.po
index 0a449f125befa84e4a367e3b697e8dd42bc0e7c9..f5b072caa47282a42a5e5679c97f82ea1bd2f554 100644
--- a/ldapdump/locale/lv/fusiondirectory.po
+++ b/ldapdump/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/nb/fusiondirectory.po b/ldapdump/locale/nb/fusiondirectory.po
index c8ec57142f7a6662ec22d66ee3541f1a40de91b5..65a769ef0e71273f41ab743b4b1cadac69537105 100644
--- a/ldapdump/locale/nb/fusiondirectory.po
+++ b/ldapdump/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/nl/fusiondirectory.po b/ldapdump/locale/nl/fusiondirectory.po
index 0e344113846bbee89d5c2ef87dd5e957f9f8bf06..e5d3a8b553652ec3e1d0e7f4db3c7d77715bbf3d 100644
--- a/ldapdump/locale/nl/fusiondirectory.po
+++ b/ldapdump/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ldapdump/locale/pl/fusiondirectory.po b/ldapdump/locale/pl/fusiondirectory.po
index d48b57e765a8e1bdb6e8c39f041003e71dfca19f..b601e541ecf944160d47124da3350439e30e1196 100644
--- a/ldapdump/locale/pl/fusiondirectory.po
+++ b/ldapdump/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: addons/ldapdump/class_ldapDump.inc:26
 msgid "LDAP"
diff --git a/ldapdump/locale/pt/fusiondirectory.po b/ldapdump/locale/pt/fusiondirectory.po
index 8566a57bc4952d828418e9a3d541cfee2fa8f69a..8bd11e32706408b707ae1f8eda08920538a66ada 100644
--- a/ldapdump/locale/pt/fusiondirectory.po
+++ b/ldapdump/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/pt_BR/fusiondirectory.po b/ldapdump/locale/pt_BR/fusiondirectory.po
index a87c8555026096fd62395a3201af749b7e1ddce2..0f04ab7fb8aef97a549876d94b38bb1c9c34b9dc 100644
--- a/ldapdump/locale/pt_BR/fusiondirectory.po
+++ b/ldapdump/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/ldapdump/locale/ru/fusiondirectory.po b/ldapdump/locale/ru/fusiondirectory.po
index 232eea53a96132616dccf79b51886e8a77f9102f..3ba906c53ca57b761e0888518be6e52b8ec325e2 100644
--- a/ldapdump/locale/ru/fusiondirectory.po
+++ b/ldapdump/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/ldapdump/locale/ru@petr1708/fusiondirectory.po b/ldapdump/locale/ru@petr1708/fusiondirectory.po
index da4b8105fc95b1cb692aa28d0eef17041b2fb118..d204c9e1dbfe2a57a075617d01ec732ca7c51b9a 100644
--- a/ldapdump/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapdump/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/sv/fusiondirectory.po b/ldapdump/locale/sv/fusiondirectory.po
index a75b0d2e5c02cc5715499f1c77f411f33603c40e..dda8d0a6751be2588e128cdec23a72d82c1b8328 100644
--- a/ldapdump/locale/sv/fusiondirectory.po
+++ b/ldapdump/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/ldapdump/locale/ug/fusiondirectory.po b/ldapdump/locale/ug/fusiondirectory.po
index b5ad5250365f7b71f777a4dd528c61f03ca15801..2a58788cc568c539f3789529696ef21d04d5af48 100644
--- a/ldapdump/locale/ug/fusiondirectory.po
+++ b/ldapdump/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/vi_VN/fusiondirectory.po b/ldapdump/locale/vi_VN/fusiondirectory.po
index f98eb6c588504f19e9c3a4faa8100f1250a131fa..33fad40b37e25d4e174bac96bd2206cc2e5c5ba0 100644
--- a/ldapdump/locale/vi_VN/fusiondirectory.po
+++ b/ldapdump/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/ldapdump/locale/zh/fusiondirectory.po b/ldapdump/locale/zh/fusiondirectory.po
index c144cb40fd69683ff65120485330e66c117388bb..3cd20507ce275c59462459ef2dc38fc61572a818 100644
--- a/ldapdump/locale/zh/fusiondirectory.po
+++ b/ldapdump/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapmanager/addons/ldapmanager/class_csvimport.inc b/ldapmanager/addons/ldapmanager/class_csvimport.inc
index 2eb0fc62fdce113f7945981c04cb6f758aa999a7..5944779477577a34213e148d2c9471ac81e6724c 100644
--- a/ldapmanager/addons/ldapmanager/class_csvimport.inc
+++ b/ldapmanager/addons/ldapmanager/class_csvimport.inc
@@ -64,6 +64,9 @@ class csvimport extends simplePlugin
             array(',', ';'), '', NULL,
             'import_file'
           ),
+          new HiddenAttribute (
+            'valueSeparator', FALSE, '|'
+          ),
           new SetAttribute(
             new StringAttribute(
               _('Fixed values'), _('Some fixed values that you might wanna use in the filling of the template.'),
@@ -114,18 +117,7 @@ class csvimport extends simplePlugin
   {
     parent::__construct($dn, $object, $parent, $mainTab);
     $this->attributesAccess['type']->setSubmitForm('typeChanged');
-    $choices  = array();
-    $types    = objects::types();
-    foreach ($types as $type) {
-      if (in_array($type, departmentManagement::getDepartmentTypes())) {
-        continue;
-      }
-      $infos = objects::infos($type);
-      if ($infos['templateActive']) {
-        $choices[$type] = $infos['name'];
-      }
-    }
-    asort($choices);
+    $choices = template::getTemplatedTypes();
     $this->attributesAccess['type']->setChoices(array_keys($choices), array_values($choices));
     /* People usually import users, so set it as default */
     $this->attributesAccess['type']->setDefaultValue('USER');
@@ -274,7 +266,8 @@ class csvimport extends simplePlugin
     if (is_array($i)) {
       $value = array();
       foreach ($i as $j) {
-        $value[] = $this->compute_attribute_value($attribute, $row, $j);
+        $v = explode($this->valueSeparator, $this->compute_attribute_value($attribute, $row, $j));
+        $value = array_merge($value, $v);
       }
       return $value;
     } else {
diff --git a/ldapmanager/addons/ldapmanager/contentcsv.tpl b/ldapmanager/addons/ldapmanager/contentcsv.tpl
deleted file mode 100644
index 37b2d1c5a69798457c701183eed3f682945ee4d9..0000000000000000000000000000000000000000
--- a/ldapmanager/addons/ldapmanager/contentcsv.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-<p>
-{t}The CSV import plugin provides methods to generate user accounts from a file containing Semi-Colon Seperated Values. The administrator can decide which columns should be transfered to which attribute. Note that you must have at least the GIVENNAME and SURNAME set.{/t}
-</p>
-<p class="seperator">&nbsp;</p>
-
-{if $fileup != TRUE}
-<table>
-  <tr>
-    <td>
-      <LABEL for="userfile">{t}Select CSV file to import{/t}</LABEL>
-    </td>
-    <td>
-    <input type="hidden" name="MAX_FILE_SIZE" value="2097152">
-    <input id="userfile" name="userfile" type="file" value="{t}Browse{/t}">
-    </td>
-  </tr>
-  <tr>
-    <td>
-    <LABEL for="template">{t}Select template{/t}</LABEL>
-    </td>
-    <td>
-    <select id="template" name="template" size="1" title="">
-      {html_options options=$templates selected=""}
-    </select>
-    </td>
-
-  </tr>
-</table>
-{elseif $sorted != FALSE}
-
-
-<br>
-    {if $error == FALSE}
-       <b>{t}All entries have been written to the LDAP database successfully.{/t}</b>
-    {else}
-       <b style="color:red">{t}Oups. There was an error during the import of your data.{/t}</b>
-  {/if}
-
-<b>{t}Here is the status report for the import:{/t} </b>
-<br>
-<br>
-
-
-  <table border="0" bgcolor="#FEFEFE">
-    <tr>
-      {foreach from=$head item=h}
-      <td bgcolor="#BBBBBB">
-        <b>{$h}</b>
-      </td>
-      {/foreach}
-    </tr>
-    {if $pointsbefore == TRUE}
-    <tr>
-      <td colspan={$i} bgcolor = "#EEEEEE">
-        ...
-      </td>
-    </tr>
-    {/if}
-
-    {foreach from=$data item=row key=key}
-    <tr>
-      {foreach from=$data[$key] item=col key=key2}
-      <td bgcolor="#EEEEEE">
-        {$data[$key][$key2]}
-      </td>
-      {/foreach}
-    </tr>
-    {/foreach}
-      {if $pointsafter == TRUE}
-      <tr>
-          <td colspan={$i} bgcolor = "#EEEEEE">
-          ...
-          </td>
-      </tr>
-      {/if}
-
-  </table>
-
-{else}
-<br><b>{t}Selected Template{/t}:</b> {$tpl}
-<br>
-<br>
-  <table border=0 bgcolor="#FEFEFE">
-    {foreach from=$data[0] item=val key=key}
-    <tr>
-      <td bgcolor="#BBBBBB">
-        <select name="row{$key}" size="1" title="">
-             {html_options options=$attrs selected=$selectedattrs[$key]}
-        </select>
-      </td>
-      {foreach from=$data item=val2 key=key2}
-      <td bgcolor="#EEEEEE">
-        {$data[$key2][$key]}&nbsp;
-      </td>
-      {/foreach}
-    </tr>
-    {/foreach}
-
-  </table>
-
-{/if}
-<p class="plugbottom">
-{if $fileup != TRUE}
-  <input type="submit" value="{t}Import{/t}" name="fileup" >
-{else}
-{if $sorted == FALSE}
-  <input name="sorted" value="{t}Import{/t}" type ="submit">
-{else}
-  <input type=submit name="back{$plug}" value="{msgPool type=backButton}">
-{/if}
-{/if}
-</p>
-<input type="hidden" name="ignore">
diff --git a/ldapmanager/locale/ar/fusiondirectory.po b/ldapmanager/locale/ar/fusiondirectory.po
index 3262849090056e35c98c5629b89c3df47be9bada..1bba4652b47f1777741bbbe02ce959b8d5032c7c 100644
--- a/ldapmanager/locale/ar/fusiondirectory.po
+++ b/ldapmanager/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/ca/fusiondirectory.po b/ldapmanager/locale/ca/fusiondirectory.po
index bdef8704cd1f1e2df3737d6c2d9fdac39fb267e7..0f75e2fa02e6badd099c2a2cd51e50fde99281fa 100644
--- a/ldapmanager/locale/ca/fusiondirectory.po
+++ b/ldapmanager/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Èxit"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/cs_CZ/fusiondirectory.po b/ldapmanager/locale/cs_CZ/fusiondirectory.po
index e502f6288a9fc090c7aa8de9037a12f123ec9b43..5872c6dd2f4a2dfc1df022afa622712b8599b828 100644
--- a/ldapmanager/locale/cs_CZ/fusiondirectory.po
+++ b/ldapmanager/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -74,42 +74,42 @@ msgstr "Oddělovač"
 msgid "Character used as separator in the CSV file"
 msgstr "Znak sloužící jako oddělovač v CSV souboru"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr "Neměnné hodnoty"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 "Některé neměnné hodnoty které by se mohly hodit při vyplňování šablony."
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "import(ovat)"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr "Vyplňování šablony"
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr "Vyberte přiřazení políček"
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "úspěch"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr "%d položek bylo úspěšně importováno"
diff --git a/ldapmanager/locale/de/fusiondirectory.po b/ldapmanager/locale/de/fusiondirectory.po
index 1ed301b8b73390966df7c19acd7d9f1f2b2fa42c..c2401ebf4413be98bc7e74a0cf648644559cc292 100644
--- a/ldapmanager/locale/de/fusiondirectory.po
+++ b/ldapmanager/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -74,41 +74,41 @@ msgstr "Feldtrenner"
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr "Feste Werte"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Importieren"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Erfolg"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr "%d Einträge erfolgreich importiert"
diff --git a/ldapmanager/locale/el_GR/fusiondirectory.po b/ldapmanager/locale/el_GR/fusiondirectory.po
index 899e1f1577ceabe4b21b10d37dcef772fe6a1f97..26fee6cd8792883fad5f72f256cedf2d6dea2a54 100644
--- a/ldapmanager/locale/el_GR/fusiondirectory.po
+++ b/ldapmanager/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -75,41 +75,41 @@ msgstr "Διαχωριστικό"
 msgid "Character used as separator in the CSV file"
 msgstr "Χαρακτήρας που χρησιμοποιείται ως διαχωριστικό στο αρχείο CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr "Προκαθορισμένες τιμές"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr "Γέμισμα προτύπων"
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr "Επιλογή συσχετισμών πεδίων"
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr "Πετυχημένη εισαγωγή %d καταχωρήσεων"
diff --git a/ldapmanager/locale/en/fusiondirectory.po b/ldapmanager/locale/en/fusiondirectory.po
index 46c9df580412f50f2802c1b439d8bb53e5822463..15254b8c10ee1a85fe2222f54741799bf8082add 100644
--- a/ldapmanager/locale/en/fusiondirectory.po
+++ b/ldapmanager/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -73,41 +73,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/es/fusiondirectory.po b/ldapmanager/locale/es/fusiondirectory.po
index a693657fa803a06c33f4c06993b787c3a2cf359f..cb02935642598b682891d2a69fb401b1e9799bff 100644
--- a/ldapmanager/locale/es/fusiondirectory.po
+++ b/ldapmanager/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -74,41 +74,41 @@ msgstr "Separador"
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Importar"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Correcto"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/es_CO/fusiondirectory.po b/ldapmanager/locale/es_CO/fusiondirectory.po
index ca6dc12cfd922842f187762ce3bd9db04396368f..b50421b57a705a3d3931c96405ae8bf692320402 100644
--- a/ldapmanager/locale/es_CO/fusiondirectory.po
+++ b/ldapmanager/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Realizado con éxito"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/es_VE/fusiondirectory.po b/ldapmanager/locale/es_VE/fusiondirectory.po
index 224604ccfa6366cceeb2c59a71d26c7462d041f9..b4953571065ea13fd2165684477ece673d06624b 100644
--- a/ldapmanager/locale/es_VE/fusiondirectory.po
+++ b/ldapmanager/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -74,41 +74,41 @@ msgstr "Separador"
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Importar"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Correcto"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/fa_IR/fusiondirectory.po b/ldapmanager/locale/fa_IR/fusiondirectory.po
index 0f5b9a0920329faac0f6beffadce6fe8319206c3..e649b7a583e9d2200e222b38f9cae428e26fdbfb 100644
--- a/ldapmanager/locale/fa_IR/fusiondirectory.po
+++ b/ldapmanager/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/fi_FI/fusiondirectory.po b/ldapmanager/locale/fi_FI/fusiondirectory.po
index fed79f6add15ca0e7a73ba710ae1056a9a6b00c2..1baf836c99e6db9d9d31215db2848f74b504446e 100644
--- a/ldapmanager/locale/fi_FI/fusiondirectory.po
+++ b/ldapmanager/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/fr/fusiondirectory.po b/ldapmanager/locale/fr/fusiondirectory.po
index 2c8c3d383823af69a9bde8c99633a9155b0f5e5f..510c97c4224674b7d92ad1dde84c9289abdc403c 100644
--- a/ldapmanager/locale/fr/fusiondirectory.po
+++ b/ldapmanager/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,21 +24,19 @@ msgstr "Import / Export LDAP"
 
 #: addons/ldapmanager/tabs_ldif.inc:32
 msgid "Allows the import or export of the ldap tree"
-msgstr ""
-"Cette extension vous permet d'importer ou exporter des parties de votre "
-"annuaire LDAP"
+msgstr "Permet d'importer ou exporter des parties de votre arbre LDAP"
 
 #: addons/ldapmanager/tabs_ldif.inc:36
 msgid "Ldap manager"
-msgstr "Gérer l'annuaire LDAP"
+msgstr "Gestion LDAP"
 
 #: addons/ldapmanager/class_csvimport.inc:29
 msgid "CSV import"
-msgstr "Importation CSV"
+msgstr "Import CSV"
 
 #: addons/ldapmanager/class_csvimport.inc:30
 msgid "Import of csv data into the ldap tree"
-msgstr "importer des données CVS dans votre annuaire ldap"
+msgstr "Importer des données CSV dans votre annuaire LDAP"
 
 #: addons/ldapmanager/class_csvimport.inc:43
 msgid "Import CSV"
@@ -58,7 +56,7 @@ msgstr "Modèle"
 
 #: addons/ldapmanager/class_csvimport.inc:52
 msgid "Select a template to apply to imported entries"
-msgstr "Sélectionnez un modèle a appliquer aux entrées importées"
+msgstr "Sélectionnez un modèle à appliquer aux entrées importées"
 
 #: addons/ldapmanager/class_csvimport.inc:58
 msgid "CSV file"
@@ -76,43 +74,43 @@ msgstr "Séparateur"
 msgid "Character used as separator in the CSV file"
 msgstr "Caractère utilisé comme séparateur dans votre fichier CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr "Valeurs fixes"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 "Certaines valeurs fixes que vous voulez utiliser dans le remplissage du "
 "modèle."
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Importer"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr "Remplissage du modèle"
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr "Sélectionnez l'association des champs"
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
-msgstr "L'importation à échoué pour la ligne %d"
+msgstr "L'importation a échoué à la ligne %d"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Réussi"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr "%d entrées importées avec succès"
@@ -123,21 +121,21 @@ msgstr "LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:46
 msgid "Export/Import the ldap tree to/from LDIF format"
-msgstr "Exporter l'annuaire ldap sous format ldif"
+msgstr "Exporter/Importer l'arbre LDAP au format LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:48
 msgid "LDAP Manager"
-msgstr "Gérer l'annuaire"
+msgstr "Gestion LDAP"
 
 #: addons/ldapmanager/class_ldapmanager.inc:61
 #: addons/ldapmanager/class_ldapmanager.inc:74
 #: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
-msgstr "Exporter"
+msgstr "Export"
 
 #: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
-msgstr "DN d'une entrée à exporter comme ldif"
+msgstr "DN d'une entrée à exporter comme LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
@@ -149,17 +147,19 @@ msgstr "Filtre"
 
 #: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
-msgstr "Filtre a utiliser pour sélectionner les objets à exporter"
+msgstr "Filtre à utiliser pour sélectionner les objets à exporter"
 
 #: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
-msgstr "Telecharger un snapshot complet de l'annuaire LDAP "
+msgstr ""
+"Télécharger un instantané complet de l'annuaire LDAP pour cette base au "
+"format LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
-msgstr "Exporter un fichier LDIF complet pour "
+msgstr "Exporter un LDIF complet pour "
 
 #: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
@@ -174,21 +174,21 @@ msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
-"Enlever les entrées qui ne sont pas dans le LDIF de l'annuaire si elles "
-"existaient"
+"Enlever les champs qui ne sont pas dans le LDIF de l'annuaire LDAP si ils "
+"existaient."
 
 #: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
-"Importer un fichier LDIF dans votre annuaire. Souvenez vous que "
-"FusionDirectory ne vérifiera pas si votre fichier est conforme au besoin de "
-"FusionDirectory "
+"Importer un fichier LDIF dans votre annuaire. Souvenez-vous que "
+"FusionDirectory ne vérifiera pas si votre fichier est conforme à "
+"l’organisation utilisée par FusionDirectory "
 
 #: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
-msgstr "Importation d'un fichier LDIF"
+msgstr "Import d'un fichier LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:153
 #: addons/ldapmanager/class_ldapmanager.inc:198
@@ -198,7 +198,7 @@ msgstr "Erreur LDAP"
 #: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
-msgstr "Pas d'objet '%s' !"
+msgstr "Pas d'objet %s !"
 
 #: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
@@ -207,7 +207,7 @@ msgstr "Erreur de permissions"
 #: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
-msgstr "Vous n'avez pas l'autorisation d'exporter '%s' !"
+msgstr "Vous n'avez pas l'autorisation d'exporter %s !"
 
 #: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
@@ -218,7 +218,7 @@ msgstr "Erreur"
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 "Échec de la création d'une exportation de votre annuaire ldap, l'erreur est "
-"'%s' !"
+"«%s» !"
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
diff --git a/ldapmanager/locale/hu_HU/fusiondirectory.po b/ldapmanager/locale/hu_HU/fusiondirectory.po
index 34de617f01dc31a8f57b970a1303a7126e13d269..2e6d8b04e348cd1c2d5447d1f6e9b2064004ae7a 100644
--- a/ldapmanager/locale/hu_HU/fusiondirectory.po
+++ b/ldapmanager/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -73,41 +73,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/id/fusiondirectory.po b/ldapmanager/locale/id/fusiondirectory.po
index 6253d29abfb013e0b915ee70b6879e58be48d01e..97ba085df74745c625c66c2646f411f8fb4540d8 100644
--- a/ldapmanager/locale/id/fusiondirectory.po
+++ b/ldapmanager/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -73,41 +73,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/it_IT/fusiondirectory.po b/ldapmanager/locale/it_IT/fusiondirectory.po
index d1d33ac489e8e710a32bf5febae2061d1b59d24f..e734b4c7e10e831945f042cbc0f55f5ef6001083 100644
--- a/ldapmanager/locale/it_IT/fusiondirectory.po
+++ b/ldapmanager/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -74,43 +74,43 @@ msgstr "Separatore"
 msgid "Character used as separator in the CSV file"
 msgstr "Carateri utilizzati come separatore nel file CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr "Valori fissi"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 "Alcuni valori fissi che potreste voler utilizzare nel riempimento del "
 "modello"
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Importa"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr "Riempimento dei modelli"
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr "Selezionare associazione di campi"
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr "Importazione non riuscita per la linea %d"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Completato"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr "%d di dati importati con successo"
diff --git a/ldapmanager/locale/lv/fusiondirectory.po b/ldapmanager/locale/lv/fusiondirectory.po
index 23cb6bcb679c720f4ce850f4b31b210ea9122a4f..4d2db2ccae30b3149bf5331314f73f45ee2c7b0f 100644
--- a/ldapmanager/locale/lv/fusiondirectory.po
+++ b/ldapmanager/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/nb/fusiondirectory.po b/ldapmanager/locale/nb/fusiondirectory.po
index c19fc6b72e3f56b1973588006ec128ac6e9ce60f..de3b8e829a95a35121b1fb0938622b19e46d2238 100644
--- a/ldapmanager/locale/nb/fusiondirectory.po
+++ b/ldapmanager/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/nl/fusiondirectory.po b/ldapmanager/locale/nl/fusiondirectory.po
index 650cd7ec2eeb00f00f6629ba1aeeef7c63e82090..45a10936c8cdb3ee97b1ad3d379f78172ddb1406 100644
--- a/ldapmanager/locale/nl/fusiondirectory.po
+++ b/ldapmanager/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -74,41 +74,41 @@ msgstr "Separator"
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr "Vaste waarden"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Importeren"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Succes"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/pl/fusiondirectory.po b/ldapmanager/locale/pl/fusiondirectory.po
index 6820cd80594ee762d669c04f7193aeb754abec63..9c921a0015aa7185fbb641a1530c6d97c2a4970a 100644
--- a/ldapmanager/locale/pl/fusiondirectory.po
+++ b/ldapmanager/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: addons/ldapmanager/tabs_ldif.inc:31
 msgid "LDAP import/export"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Import"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Powodzenie"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/pt/fusiondirectory.po b/ldapmanager/locale/pt/fusiondirectory.po
index f9dc88e1526075310cd098279a3c8ed97fdbef94..e8c3dc1384c0642a1d042f1e0f47259c86c5955e 100644
--- a/ldapmanager/locale/pt/fusiondirectory.po
+++ b/ldapmanager/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Sucesso"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/pt_BR/fusiondirectory.po b/ldapmanager/locale/pt_BR/fusiondirectory.po
index a1dc3e845b214e434318334b450728e993edc6e5..3efcedd3ca17b77830acdb830a28489e28652e94 100644
--- a/ldapmanager/locale/pt_BR/fusiondirectory.po
+++ b/ldapmanager/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Importar"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Sucesso"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/ru/fusiondirectory.po b/ldapmanager/locale/ru/fusiondirectory.po
index 151af144ad5f5e11bdb2c4a74d108f14ab97d98a..82d79bb4efbae6ab5ca000eb1728c57fdd751551 100644
--- a/ldapmanager/locale/ru/fusiondirectory.po
+++ b/ldapmanager/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -74,41 +74,41 @@ msgstr "Разделитель"
 msgid "Character used as separator in the CSV file"
 msgstr "Символ используемый как разделитель в CSV файле"
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "Импортировать"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Успешно"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr "Импорт удачно завершен для %d записей"
diff --git a/ldapmanager/locale/ru@petr1708/fusiondirectory.po b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
index 7a040c63e229146b0ba4461f74394ee6bca1d1ac..e52deb076f43cff051c896ee29d707d75346b131 100644
--- a/ldapmanager/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -73,41 +73,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/sv/fusiondirectory.po b/ldapmanager/locale/sv/fusiondirectory.po
index 4410d470575f30bd7d038a8b25f919af16a0d337..817e2b5553e42a05d9f27c404b4cfab150801fa6 100644
--- a/ldapmanager/locale/sv/fusiondirectory.po
+++ b/ldapmanager/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/ug/fusiondirectory.po b/ldapmanager/locale/ug/fusiondirectory.po
index dee6944e734a8d325cb8fdbce497b0b586acbbaa..9b7e00cca2e0af43c9e291f83f3145240add7a9b 100644
--- a/ldapmanager/locale/ug/fusiondirectory.po
+++ b/ldapmanager/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -73,41 +73,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/vi_VN/fusiondirectory.po b/ldapmanager/locale/vi_VN/fusiondirectory.po
index d2260e94710466d0e074a05d411ffc0998e68499..803291411f03b3a9b1b5f270957577acecf97d37 100644
--- a/ldapmanager/locale/vi_VN/fusiondirectory.po
+++ b/ldapmanager/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr "Thành công"
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/zh/fusiondirectory.po b/ldapmanager/locale/zh/fusiondirectory.po
index ccc184236c8c0ed6ab35bd02066fe2113356522f..855ba67fe225cfc1d5a24b1e8d65c13396fd9aba 100644
--- a/ldapmanager/locale/zh/fusiondirectory.po
+++ b/ldapmanager/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -74,41 +74,41 @@ msgstr ""
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
+#: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:78
-#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr "导入"
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:251
+#: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/mail/admin/groups/mail/class_groupMail.inc b/mail/admin/groups/mail/class_mailGroup.inc
similarity index 61%
rename from mail/admin/groups/mail/class_groupMail.inc
rename to mail/admin/groups/mail/class_mailGroup.inc
index 2d00fc8a7cc17ab3501e935cb3e6e6895e62fb3e..f944b055a9f25c4dc2718975ccd777d7f29adf70 100644
--- a/mail/admin/groups/mail/class_groupMail.inc
+++ b/mail/admin/groups/mail/class_mailGroup.inc
@@ -35,7 +35,7 @@ class GroupMailsAttribute extends MailsAttribute
   }
 }
 
-class mailgroup extends simplePlugin
+class mailGroup extends simplePlugin
 {
   var $displayHeader  = TRUE;
   var $objectclasses  = array('fdGroupMail');
@@ -63,7 +63,7 @@ class mailgroup extends simplePlugin
             'mail', TRUE
           ),
           new SelectAttribute (
-            _('Server'), _('Server mail'),
+            _('Server'), _('Email server'),
             'gosaMailServer', TRUE,
             array('')
           ),
@@ -91,17 +91,32 @@ class mailgroup extends simplePlugin
   {
     parent::__construct($dn, $object, $parent, $mainTab);
 
-    if (isset($object->cn)) {
-      $this->cn = $object->cn;
-    } elseif (isset($this->attrs['cn'])) {
-      $this->cn = $this->attrs['cn'][0];
-    }
-
     $this->attributesAccess['gosaMailServer']->setChoices(array_keys(mailMethod::getMailServers()));
     $this->attributesAccess['gosaMailServer']->setSubmitForm('mailServerChanged');
     $this->mailServerChanged();
   }
 
+  /* We need $mailAccount->cn to return the cn for mailMethod */
+  public function __get($name)
+  {
+    if (($name == 'cn') && isset($this->parent)) {
+      return $this->parent->getBaseObject()->$name;
+    } else {
+      /* Calling default behaviour */
+      return parent::__get($name);
+    }
+  }
+
+  public function __isset($name)
+  {
+    if (($name == 'cn') && isset($this->parent)) {
+      return isset($this->parent->getBaseObject()->$name);
+    } else {
+      /* Calling default behaviour */
+      return parent::__isset($name);
+    }
+  }
+
   public function mailServerChanged()
   {
     /* Intialize the used mailMethod */
@@ -114,9 +129,67 @@ class mailgroup extends simplePlugin
     $this->mailMethod->fixAttributesOnLoad();
 
     /* Initialize configured values */
-    if ($this->is_account && $this->initially_was_account) {
+    if (!$this->is_template && $this->is_account && $this->initially_was_account) {
       $this->attributesAccess['mail']->setDisabled(!$this->mailMethod->isModifyableMail());
       $this->attributesAccess['gosaMailServer']->setDisabled(!$this->mailMethod->isModifyableServer());
     }
   }
+
+  protected function shouldSave()
+  {
+    /* mail method might have something to save (like password change from main tab for instance) */
+    return TRUE;
+  }
+
+  public function ldap_save()
+  {
+    if (!empty($this->attrs)) {
+      $errors = parent::ldap_save();
+      if (!empty($errors)) {
+        return $errors;
+      }
+    }
+
+    $errors = array();
+
+    /* Only do IMAP actions if we are not a template */
+    if (!$this->is_template) {
+      $this->mailMethod->connect();
+      if (!$this->mailMethod->is_connected()) {
+        $errors[] = sprintf(_('Mail method cannot connect: %s'), $this->mailMethod->get_error());
+      } else {
+        if (!$this->mailMethod->updateMailbox()) {
+          $errors[] = sprintf(_('Cannot update mailbox: %s'), $this->mailMethod->get_error());
+        }
+      }
+    }
+    $this->mailMethod->disconnect();
+
+    if (!empty($errors) && !$this->initially_was_account) {
+      /* Mail method failed to create, cancel ldap save */
+      $this->prepareNextCleanup();
+      $this->prepare_remove();
+      $this->ldap_remove();
+    }
+
+    return $errors;
+  }
+
+  function post_remove()
+  {
+    /* Let the mailMethod remove this mailbox */
+    if (!$this->is_template) {
+      if (!$this->mailMethod->connect()) {
+        msg_dialog::display(_('Mail error'), sprintf(_('Cannot remove mailbox, mail method cannot connect: %s'),
+              $this->mailMethod->get_error()), ERROR_DIALOG);
+      } else {
+        if (!$this->mailMethod->deleteMailbox()) {
+          msg_dialog::display(_('Mail error'), sprintf(_('Cannot remove mailbox: %s'),
+                $this->mailMethod->get_error()), ERROR_DIALOG);
+        }
+      }
+    }
+    $this->mailMethod->disconnect();
+    parent::post_remove();
+  }
 }
diff --git a/mail/locale/ar/fusiondirectory.po b/mail/locale/ar/fusiondirectory.po
index caef1ce4463c6330dbccf7232ee954fb5c04d847..d9ee2d2270da8e5bb8f6a0a1ec9952db66315d5b 100644
--- a/mail/locale/ar/fusiondirectory.po
+++ b/mail/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "خادم"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -187,16 +192,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "معلومات"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/ca/fusiondirectory.po b/mail/locale/ca/fusiondirectory.po
index 76c0746b8cca428b222777c8cf29b68fda9e8ebb..83865a08ccab0bfa31aadc25de27a049b6ec398f 100644
--- a/mail/locale/ca/fusiondirectory.po
+++ b/mail/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Error de la configuració"
 
@@ -187,16 +192,11 @@ msgstr "Error de la configuració"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Informació"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/cs_CZ/fusiondirectory.po b/mail/locale/cs_CZ/fusiondirectory.po
index 3e95e20038a1dac93b59c11ca437ab2c69996d61..dd1983b0e3a1a9d78c77525cb7f0a8ddaea217cc 100644
--- a/mail/locale/cs_CZ/fusiondirectory.po
+++ b/mail/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "chyba e-mailu"
 
@@ -43,7 +45,7 @@ msgstr "Část kvóty, která je využita"
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "e-mail"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr "E-mailový účet"
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "hlavní adresa"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr "Hlavní e-mailová adresa"
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "server"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr "Ostatní adresy a přesměrování"
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "alternativní adresy"
 
@@ -149,6 +151,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "E-mailová metodou se nelze připojit: %s"
@@ -159,6 +162,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Nezdařilo se aktualizovat schránku: %s"
@@ -174,17 +178,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr "E-mailovou schránku se nedaří odebrat, nedaří se připojit metodou: %s"
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Nelze odebrat schárnku: %s"
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "chyba v nastavení"
 
@@ -193,16 +198,11 @@ msgstr "chyba v nastavení"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "Nastavený atribut zprávy '%s' není podporován!"
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "neznámé"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "neomezené"
 
@@ -285,35 +285,35 @@ msgstr "Sdílená předpona"
 msgid "Prefix to add for mail shared folders."
 msgstr "Předpona, kterou přidat pro sdílené poštovní složky."
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr "Předvolby skupinového e-mailu"
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "informace"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr "Hlavní e-mailová adresa"
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Serverová pošta"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr "Alternativní e-mailové adresy této skupiny"
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "přeposlat zprávy těm, kdo nejsou členy skupiny"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr "Může přijímat pouze místní e-maily"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/de/fusiondirectory.po b/mail/locale/de/fusiondirectory.po
index 8f6a417a2d939fcc89b406e395bf15955aae75a2..be4f98407a102d7402f15c3104a63e7b12029a79 100644
--- a/mail/locale/de/fusiondirectory.po
+++ b/mail/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "Mail-Fehler"
 
@@ -43,7 +45,7 @@ msgstr "Teil der verwendeten Quota"
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Mail"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr "Mail-Konto"
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Primäre Adresse"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr "Primäre Mailadresse"
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Server"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr "Weitere Adressen und Weiterleitungen"
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Alternative Adressen"
 
@@ -149,6 +151,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Mail-Methode kann nicht verbinden: %s"
@@ -159,6 +162,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Kann das Postfach nicht aktualisieren: '%s'"
@@ -174,17 +178,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Kann das Postfach nicht entfernen: %s"
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -193,16 +198,11 @@ msgstr "Konfigurationsfehler"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "Das eingestellte Mail-Attribut '%s' wird nicht unterstützt!"
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "Ohne Beschränkung"
 
@@ -283,35 +283,35 @@ msgstr "Geteiltes Prefix"
 msgid "Prefix to add for mail shared folders."
 msgstr "Hinzuzufügendes Prefix für Mail geteilter Ordner"
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr "Gruppenmailoptionen"
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Information"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr "Die primäre Mailadresse"
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Server Mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr "Alternative Mailadressen für die Gruppe"
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/el_GR/fusiondirectory.po b/mail/locale/el_GR/fusiondirectory.po
index 9fd93aa50ca1baa7c719a0d8dfa56d8bd0053a5f..e60b50e794c85c5f4122ea6ab514483a3b60d5d6 100644
--- a/mail/locale/el_GR/fusiondirectory.po
+++ b/mail/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "Σφάλμα αλληλογραφίας"
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Αλληλογραφία"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr "Λογαριασμός αλληλογραφίας"
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Κύρια διεύθυνση"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr "Κύρια διεύθυνση αλληλογραφίας"
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr "Άλλες διευθύνσεις και αναδρομολογήσεις"
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Εναλλακτικές διευθύνσεις"
 
@@ -150,6 +152,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -160,6 +163,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -175,17 +179,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Αδυναμία διαγραφής γραμματοκιβωτίου: %s"
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Σφάλμα ρύθμισης"
 
@@ -194,16 +199,11 @@ msgstr "Σφάλμα ρύθμισης"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "Απεριόριστο"
 
@@ -282,35 +282,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr "Επιλογές ομάδων αλληλογραφίας"
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Πληροφορίες"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr "Κύρια διεύθυνση αλληλογραφίας"
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Διακομιστής αλληλογραφίας"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr "Εναλλακτική διεύθυνση e-mail για αυτή την ομάδα"
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Προώθηση μηνυμάτων στα μη μέλη της ομάδας"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr "Επιτρέπεται να λαμβάνουν μόνο τοπική αλληλογραφία"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/en/fusiondirectory.po b/mail/locale/en/fusiondirectory.po
index 3147c4c673450b3a73d72f0595e60cb6de4f09ed..bddf28f68a360096cb7a7b57eaa24e0cf551a8f2 100644
--- a/mail/locale/en/fusiondirectory.po
+++ b/mail/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -24,6 +24,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -42,7 +44,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -56,7 +58,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -65,7 +67,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -82,7 +84,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -142,6 +144,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -152,6 +155,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -167,17 +171,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -186,16 +191,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -272,35 +272,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/es/fusiondirectory.po b/mail/locale/es/fusiondirectory.po
index 9077578eaa6f48bcbffd6afc6a02b1200e91ddc1..7f0ea81875dd097e045875f1fd3f240c836be0be 100644
--- a/mail/locale/es/fusiondirectory.po
+++ b/mail/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "Error de correo"
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Correo Electrónico"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Servidor"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
@@ -148,6 +150,7 @@ msgstr "Seleccione si quiere reenviar correos sin quedarse copias de ellos"
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "El método de correo no puede conectar: %s"
@@ -158,6 +161,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "No puedo actualizar el buzón de correo: %s"
@@ -173,17 +177,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
@@ -192,16 +197,11 @@ msgstr "Error en la configuración"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "¡El atributo '%s' configurado en el correo no esta soportado!"
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "Sin limite"
 
@@ -278,35 +278,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Información"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/es_CO/fusiondirectory.po b/mail/locale/es_CO/fusiondirectory.po
index 7c0f76e5020bada1c54fbad064aefb193fd1fa4d..a028715ae3f6242959e59e29b3e2f4db24466e7f 100644
--- a/mail/locale/es_CO/fusiondirectory.po
+++ b/mail/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Correo"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Error de configuración"
 
@@ -187,16 +192,11 @@ msgstr "Error de configuración"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Información"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/es_VE/fusiondirectory.po b/mail/locale/es_VE/fusiondirectory.po
index 3a33e59113e3db8271067426c81090bc385c02fe..dedbadff57a79e40e049907c109801f978f9bd8c 100644
--- a/mail/locale/es_VE/fusiondirectory.po
+++ b/mail/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "Error de correo"
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Correo Electrónico"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Servidor"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
@@ -148,6 +150,7 @@ msgstr "Seleccione si quiere reenviar correos sin quedarse copias de ellos"
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "El método de correo no puede conectar: %s"
@@ -158,6 +161,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "No puedo actualizar el buzón de correo: %s"
@@ -173,17 +177,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "No se puede eliminar el buzón: %s"
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
@@ -192,16 +197,11 @@ msgstr "Error en la configuración"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "¡El atributo '%s' configurado en el correo no esta soportado!"
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "Sin limite"
 
@@ -278,35 +278,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Información"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/fa_IR/fusiondirectory.po b/mail/locale/fa_IR/fusiondirectory.po
index f7745b580ed6a5338c50f128a58bcac0f0d28305..a71e8a061b0af6269e0f598d57cdee9d0c5154e3 100644
--- a/mail/locale/fa_IR/fusiondirectory.po
+++ b/mail/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -42,7 +44,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -56,7 +58,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -65,7 +67,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -82,7 +84,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -142,6 +144,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -152,6 +155,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -167,17 +171,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -186,16 +191,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -272,35 +272,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/fi_FI/fusiondirectory.po b/mail/locale/fi_FI/fusiondirectory.po
index 8ea7c18fd4110ee1fcecd9b1266b85d6b822ee06..0082721159e9def3ec3e8ad2ecc1d8055fe19d8c 100644
--- a/mail/locale/fi_FI/fusiondirectory.po
+++ b/mail/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -187,16 +192,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/fr/fusiondirectory.po b/mail/locale/fr/fusiondirectory.po
index f3f5dc1a28a0d63be8e7c20d4a28d82cd1eb1113..5167101b1d1b823f2f01ac6c2c3a9938bd0387b0 100644
--- a/mail/locale/fr/fusiondirectory.po
+++ b/mail/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "Erreur du serveur de courriel"
 
@@ -35,7 +37,7 @@ msgstr "Impossible de lire les paramètres de quota : %s"
 
 #: personal/mail/class_mailAccount.inc:55
 msgid "Quota usage"
-msgstr "Utilisation des quotas"
+msgstr "Utilisation du quota"
 
 #: personal/mail/class_mailAccount.inc:56
 msgid "Part of the quota which is used"
@@ -43,9 +45,9 @@ msgstr "Part du quota qui est utilisée"
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
-msgstr "Messagerie"
+msgstr "Courriel"
 
 #: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr "Compte courriel"
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Adresse principale"
 
@@ -66,13 +68,13 @@ msgid "Primary mail address"
 msgstr "Adresse de courriel principale"
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Serveur"
 
 #: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
-msgstr "Indiquez le serveur de courriel de l'utilisateur"
+msgstr "Indiquez le serveur de courriel pour cet utilisateur"
 
 #: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr "Autres adresses et redirections"
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Adresses alternatives"
 
@@ -97,7 +99,7 @@ msgstr "Transférer les messages vers"
 
 #: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
-msgstr "Adresses à laquelle les messages doivent être redirigés"
+msgstr "Adresses vers laquelle les messages doivent être redirigés"
 
 #: personal/mail/class_mailAccount.inc:130
 #: personal/mail/class_mailAccount.inc:149
@@ -128,7 +130,7 @@ msgstr "Options de courriel avancées"
 #: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
-"Les utilisateurs ne sont autorisés qu'à envoyer et recevoir des messages "
+"Les utilisateurs ne sont autorisés qu'à envoyer et recevoir des courriel "
 "locaux"
 
 #: personal/mail/class_mailAccount.inc:164
@@ -139,16 +141,17 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
-msgstr "Aucune distribution des courriels dans sa propre boite"
+msgstr "Aucune distribution dans sa propre boite"
 
 #: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
-"Sélectionnez ceci si vous souhaitez relayer les messages sans garder de "
+"Sélectionnez ceci si vous souhaitez relayer les courriels sans garder de "
 "copie de ceux-ci"
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Le méthode de courriel ne peut pas se connecter : %s"
@@ -156,9 +159,10 @@ msgstr "Le méthode de courriel ne peut pas se connecter : %s"
 #: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
-msgstr "Le compte de courriel '%s' n'existe pas sur le serveur : %s"
+msgstr "Le compte de courriel «%s» n'existe pas sur le serveur : %s"
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Impossible de mettre à jour le compte : %s"
@@ -171,41 +175,36 @@ msgstr "Impossible d'écrire les paramètres de quota : %s"
 #: personal/mail/class_mailAccount.inc:340
 #, php-format
 msgid "Mail error saving sieve settings: %s"
-msgstr ""
-"Erreur de messagerie lors de l'enregistrement des paramètres sieve: %s"
+msgstr "Erreur lors de l'enregistrement des paramètres Sieve : %s"
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
-"Impossible de supprimer le compte de messagerie, impossible de se connecter "
-"à : %s"
+"Impossible de supprimer la boite de courriel, impossible de se connecter : "
+"%s"
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
-msgstr "Impossible de supprimer le compte de messagerie : %s"
+msgstr "Impossible de supprimer la boite de courriel : %s"
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
 #: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "L'attribut de messagerie '%s' n'est pas supporté !"
-
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr "Le méthode de messagerie \"%s\" est inconnue !"
+msgstr "L'attribut de courriel \"%s\" n'est pas supporté !"
 
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "Illimité"
 
@@ -223,7 +222,7 @@ msgstr "Quel attribut sera utilisé pour créer des comptes."
 
 #: config/mail/class_mailPluginConfig.inc:50
 msgid "Mail user template"
-msgstr "Modèle d'utilisateur de courriel"
+msgstr "Modèle de compte de courriel"
 
 #: config/mail/class_mailPluginConfig.inc:51
 msgid "Override the user account creation syntax."
@@ -250,14 +249,14 @@ msgstr ""
 
 #: config/mail/class_mailPluginConfig.inc:65
 msgid "Delete mailbox on account deletion"
-msgstr "Supprimer le compte de courriel lors de la suppression du compte"
+msgstr "Supprimer la boite de courriel lors de la suppression du compte"
 
 #: config/mail/class_mailPluginConfig.inc:66
 msgid ""
 "Determines if the mailbox should be removed from your IMAP server after the "
 "account is deleted in LDAP."
 msgstr ""
-"Détermine si la boîte aux lettres doit être retirée de votre serveur IMAP "
+"Détermine si la boîte de courriel doit être retirée de votre serveur IMAP "
 "après la suppression du compte LDAP."
 
 #: config/mail/class_mailPluginConfig.inc:71
@@ -288,40 +287,40 @@ msgstr "Préfixe des dossiers partagés"
 msgid "Prefix to add for mail shared folders."
 msgstr "Préfixe à ajouter pour les dossiers partagés."
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr "Options de courriel du groupe"
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
-msgstr "Information"
+msgstr "Informations"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr "Adresse de courriel principale"
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr "Serveur de courriel"
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr "Adresses de courriel alternatives pour le groupe"
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Transférer les messages vers des membres n'appartenant pas au groupe"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
-msgstr "Les utilisateurs ne sont autorisés qu'à recevoir des messages locaux"
+msgstr "Les utilisateurs ne sont autorisés qu'à recevoir des courriel locaux"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
 msgstr ""
-"Ce groupe mail est uniquement autorisé à recevoir des messages provenant "
+"Ce groupe est uniquement autorisé à recevoir des messages provenant "
 "d'expéditeurs locaux"
 
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
@@ -334,4 +333,4 @@ msgstr "IMAP/POP3"
 
 #: admin/systems/services/imap/class_serviceIMAP.inc:33
 msgid "Services"
-msgstr "Service"
+msgstr "Services"
diff --git a/mail/locale/hu_HU/fusiondirectory.po b/mail/locale/hu_HU/fusiondirectory.po
index d53bb85c03cf2842ac20a46b540d53c223fd9234..801e6548388a060eb889bc14e8c3ffd9a6a4ed2b 100644
--- a/mail/locale/hu_HU/fusiondirectory.po
+++ b/mail/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -42,7 +44,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -56,7 +58,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -65,7 +67,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -82,7 +84,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -142,6 +144,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -152,6 +155,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -167,17 +171,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -186,16 +191,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -272,35 +272,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/id/fusiondirectory.po b/mail/locale/id/fusiondirectory.po
index 460a4b6a744310a069431d6aeb91cce152b5228e..8ba89cd8a596aa09e69340915548cd5b9c3357c7 100644
--- a/mail/locale/id/fusiondirectory.po
+++ b/mail/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -42,7 +44,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -56,7 +58,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -65,7 +67,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -82,7 +84,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -142,6 +144,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -152,6 +155,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -167,17 +171,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -186,16 +191,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -272,35 +272,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/it_IT/fusiondirectory.po b/mail/locale/it_IT/fusiondirectory.po
index eb785c3f374b61b66eed05d1ba70a66b1833d1f9..922c155712e8fe7b5057f2f50725e28ff11f8983 100644
--- a/mail/locale/it_IT/fusiondirectory.po
+++ b/mail/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "Errore del server di posta elettronica"
 
@@ -43,7 +45,7 @@ msgstr "Parte della quota utilizzata"
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Mail"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr "Account email"
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Indirizzo principale"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr "Indirizzo mail principale"
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Server"
 
@@ -84,7 +86,7 @@ msgid "Other addresses and redirections"
 msgstr "Altri indirizzi e redirezioni"
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Indirizzi alternativi"
 
@@ -147,6 +149,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "L'algoritmo di posta elettronica non riesce a connettersi : %s"
@@ -157,6 +160,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr "L'account di posta elettronica \"%s\" non esiste sul server mail: %s"
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Impossibile aggiornare l'account : %s"
@@ -172,6 +176,7 @@ msgid "Mail error saving sieve settings: %s"
 msgstr "Impostazioni del set di risparmio di errori di posta: %s"
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
@@ -179,12 +184,12 @@ msgstr ""
 "connettersi a: %s"
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Impossibile rimuovere mailbox : %s"
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
@@ -193,16 +198,11 @@ msgstr "Errore di configurazione"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "L'attributo mail '%s' non è supportato !"
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr "Il metodo di posta \"%s\" non è noto!"
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "Illimitato"
 
@@ -287,35 +287,35 @@ msgstr "Prefisso condiviso"
 msgid "Prefix to add for mail shared folders."
 msgstr "Prefisso da aggiungere per cartelle mail condivise."
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr "Opzioni per le mail di gruppo"
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Informazione"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr "Lindirizzo mail principale"
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Server di e-mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
+msgstr "Server di posta elettronica "
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr "Indirizzi e-mail alternativi per il gruppo"
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Inoltra i messaggi ai membri che non appartengono al gruppo"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr "L'utente è abilitato a ricevere solo messaggi locali"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/lv/fusiondirectory.po b/mail/locale/lv/fusiondirectory.po
index 55d14ea5f80000d6d773bcdceb15f6edcb1da45a..961a154f28b64e9e1e46aa07a7843effae3eb701 100644
--- a/mail/locale/lv/fusiondirectory.po
+++ b/mail/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Pasts"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -187,16 +192,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr "Grupas pasta iespējas"
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Informācija"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/nb/fusiondirectory.po b/mail/locale/nb/fusiondirectory.po
index c5333458d25ee60a4d48da26a77255282bca8161..594708fe9e6edc0fd10e72b25dd23fbeb170b983 100644
--- a/mail/locale/nb/fusiondirectory.po
+++ b/mail/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Tjener"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -187,16 +192,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/nl/fusiondirectory.po b/mail/locale/nl/fusiondirectory.po
index f9703cee226cd9857433d6d4e9c4e46b5df6852c..3fad4c63bca4607d2b6f2ab5bd927ac4e13e5553 100644
--- a/mail/locale/nl/fusiondirectory.po
+++ b/mail/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "Mail fout"
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "E-mail"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr "E-mail account"
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Primair adres"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr "Primaire e-mail adres"
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Server"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Alternatieve adressen"
 
@@ -148,6 +150,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Mail methode kan niet verbinden : %s"
@@ -158,6 +161,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr "Mailbox \"%s\" bestaat niet op mail sever: %s"
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Kan mailbox : %s niet updaten"
@@ -173,17 +177,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Kan mailbox niet verwijderen : %s"
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Configuratie fout"
 
@@ -192,16 +197,11 @@ msgstr "Configuratie fout"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "De geconfigureerde mail attribuut '%s' is niet ondersteund!"
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "Onbeperkt"
 
@@ -278,35 +278,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Informatie"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr "Het primaire email adres"
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Server e-mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Stuur berichten door naar niet groepsleden"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/pl/fusiondirectory.po b/mail/locale/pl/fusiondirectory.po
index bf60555953f32bcd38ac9346aaadd3a2a80a6503..1c2a237c62077d5a420da860446aba80c449b1a0 100644
--- a/mail/locale/pl/fusiondirectory.po
+++ b/mail/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:258
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Poczta"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Adres podstawowy"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Serwer"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Adresy alternatywne"
 
@@ -144,6 +146,7 @@ msgstr "Zaznacz jeśli chcesz przekazywać pocztę bez zachowania kopii"
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -154,6 +157,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -169,17 +173,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Błąd konfiguracji"
 
@@ -188,16 +193,11 @@ msgstr "Błąd konfiguracji"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -274,35 +274,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Informacja"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Przekaż wiadomości do członków bez grupy"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/pt/fusiondirectory.po b/mail/locale/pt/fusiondirectory.po
index 0fb9f7e1ec997c2e4c42417e696b03e5842aa7bb..744bccfe8bdc8c707f6890f442b8ce91be9a2823 100644
--- a/mail/locale/pt/fusiondirectory.po
+++ b/mail/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Correio"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Servidor"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
@@ -187,16 +192,11 @@ msgstr "Erro de configuração"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Informação"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/pt_BR/fusiondirectory.po b/mail/locale/pt_BR/fusiondirectory.po
index 7bbdd09027d458385dbf472ab2bc534c6eb27752..eb25ca11ffcd1ae93fcf362d166356bed11e7c9c 100644
--- a/mail/locale/pt_BR/fusiondirectory.po
+++ b/mail/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr "Erro de correio"
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Correio"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Endereço primário"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "servidor"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Endereços alternativos"
 
@@ -145,6 +147,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Não foi possível conectar com este método de correio: %s"
@@ -155,6 +158,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Não é possível atualizar caixa de correio: %s"
@@ -170,17 +174,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
@@ -189,16 +194,11 @@ msgstr "Erro de configuração"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -275,35 +275,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr "Opção de grupo de e-mail"
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Informação"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr "Endereço de e-mail primário"
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Servidor de e-mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr "Endereço de e-mail alternativo para o grupo"
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Encaminhar mensagens para não membros de grupos"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/ru/fusiondirectory.po b/mail/locale/ru/fusiondirectory.po
index 679387162a3c050ec60c9f6c920110a504ff296b..a8624ce2191eca98d9d90149c89a9de5a9165e45 100644
--- a/mail/locale/ru/fusiondirectory.po
+++ b/mail/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Почта"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr "Почтовый аккаунт"
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "Основной адрес"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr "Первичный адрес почты"
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Сервер"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr "Другие адреса и редиректы (перенаправления)"
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "Альтернативные адреса"
 
@@ -145,6 +147,7 @@ msgstr "Выберите, нужно ли оставлять копии пере
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -155,6 +158,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr "Почтовый ящик \"%s\" не существует на почтовом сервере: %s"
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Не могу обновить почтовый ящик: %s"
@@ -170,17 +174,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Не могу удалить почтовый ящик: \"%s\""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Ошибка конфигурации"
 
@@ -189,16 +194,11 @@ msgstr "Ошибка конфигурации"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr "Неограниченный"
 
@@ -277,35 +277,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Информация"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr "Основной адрес электронной почты"
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr "Альтернативный адрес почты для группы"
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "Пересылать сообщения не членам группы"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/ru@petr1708/fusiondirectory.po b/mail/locale/ru@petr1708/fusiondirectory.po
index 50eaf8e984333a8ee6bcfbdd05d0f495c8c65161..edb0d29a240e747746991902893bf0b508a25a98 100644
--- a/mail/locale/ru@petr1708/fusiondirectory.po
+++ b/mail/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -42,7 +44,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -56,7 +58,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -65,7 +67,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -82,7 +84,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -142,6 +144,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -152,6 +155,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -167,17 +171,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -186,16 +191,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -272,35 +272,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/sv/fusiondirectory.po b/mail/locale/sv/fusiondirectory.po
index 342c78a8e526fcf81ca931358baea14babd0d455..b7b8fc035ebdf0c9da6bec140741aa71f0744bb9 100644
--- a/mail/locale/sv/fusiondirectory.po
+++ b/mail/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Epost"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Server"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
 
@@ -187,16 +192,11 @@ msgstr "Konfigurationsfel"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Okänd"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Information"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/ug/fusiondirectory.po b/mail/locale/ug/fusiondirectory.po
index d62e5e65cf3eebd714a4e1de00135002e764dd4a..8cb0e19b500355c3208fcb7ffce472614274a09f 100644
--- a/mail/locale/ug/fusiondirectory.po
+++ b/mail/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -42,7 +44,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr ""
 
@@ -56,7 +58,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -65,7 +67,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr ""
 
@@ -82,7 +84,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -142,6 +144,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -152,6 +155,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -167,17 +171,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -186,16 +191,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -272,35 +272,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/vi_VN/fusiondirectory.po b/mail/locale/vi_VN/fusiondirectory.po
index db70bad59ae28c3e9b71903cd92b9e2b00b930c9..775a63d0cada09eb7041835aa943086ce164dcf8 100644
--- a/mail/locale/vi_VN/fusiondirectory.po
+++ b/mail/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "Thư"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr ""
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "Máy chủ (server)"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
@@ -143,6 +145,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
@@ -187,16 +192,11 @@ msgstr "Lỗi cấu hình"
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "Thông tin"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/locale/zh/fusiondirectory.po b/mail/locale/zh/fusiondirectory.po
index b202b55bd7fa340e51c048e7a1dcd7bbef341f30..3ea5d0706d8f0aa358fb93ba592f08d7cdd3b7df 100644
--- a/mail/locale/zh/fusiondirectory.po
+++ b/mail/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -25,6 +25,8 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:340
 #: personal/mail/class_mailAccount.inc:369
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
 msgid "Mail error"
 msgstr ""
 
@@ -43,7 +45,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
-#: admin/groups/mail/class_groupMail.inc:46
+#: admin/groups/mail/class_mailGroup.inc:46
 msgid "Mail"
 msgstr "邮件"
 
@@ -57,7 +59,7 @@ msgid "Mail account"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:99
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "Primary address"
 msgstr "主要地址"
 
@@ -66,7 +68,7 @@ msgid "Primary mail address"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:103
-#: admin/groups/mail/class_groupMail.inc:66
+#: admin/groups/mail/class_mailGroup.inc:66
 msgid "Server"
 msgstr "服务器"
 
@@ -83,7 +85,7 @@ msgid "Other addresses and redirections"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:119
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative addresses"
 msgstr "替代地址"
 
@@ -143,6 +145,7 @@ msgstr "如果您想转发邮件而且不想保留拷贝的话,请选择"
 
 #: personal/mail/class_mailAccount.inc:258
 #: personal/mail/class_mailAccount.inc:323
+#: admin/groups/mail/class_mailGroup.inc:159
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -153,6 +156,7 @@ msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:326
+#: admin/groups/mail/class_mailGroup.inc:162
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
@@ -168,17 +172,18 @@ msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:369
+#: admin/groups/mail/class_mailGroup.inc:183
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:373
+#: admin/groups/mail/class_mailGroup.inc:187
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
 #: personal/mail/class_mail-methods.inc:144
-#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
@@ -187,16 +192,11 @@ msgstr ""
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:481
-#, php-format
-msgid "Mail method \"%s\" is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:725
+#: personal/mail/class_mail-methods.inc:703
 msgid "Unknown"
 msgstr "未知"
 
-#: personal/mail/class_mail-methods.inc:727
+#: personal/mail/class_mail-methods.inc:705
 msgid "Unlimited"
 msgstr ""
 
@@ -273,35 +273,35 @@ msgstr ""
 msgid "Prefix to add for mail shared folders."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:47
+#: admin/groups/mail/class_mailGroup.inc:47
 msgid "Group mail options"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:59
+#: admin/groups/mail/class_mailGroup.inc:59
 msgid "Information"
 msgstr "提示信息"
 
-#: admin/groups/mail/class_groupMail.inc:62
+#: admin/groups/mail/class_mailGroup.inc:62
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:72
+#: admin/groups/mail/class_mailGroup.inc:72
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:77
+#: admin/groups/mail/class_mailGroup.inc:77
 msgid "Forward messages to non group members"
 msgstr "转发邮件到非组成员"
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid "Only allowed to receive local mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:81
+#: admin/groups/mail/class_mailGroup.inc:81
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
diff --git a/mail/personal/mail/class_mail-methods.inc b/mail/personal/mail/class_mail-methods.inc
index 93ef7105eb137ae3d5d6c6b9016486f1eb0b65e3..8bf4128daa84668a49e6a57851572371a524c00c 100644
--- a/mail/personal/mail/class_mail-methods.inc
+++ b/mail/personal/mail/class_mail-methods.inc
@@ -343,10 +343,12 @@ class mailMethod
     $prefix     = preg_replace("/\\\\([\.\/])/", "\\1", $prefix);
     $acc_string = preg_replace("/\\\\([\.\/])/", "\\1", $acc_string);
 
-    $domain = $mailpart = "";
-    $mail   = $this->parent->mail;
-    if (preg_match("/\@/", $mail)) {
-      list($mailpart,$domain) = explode("@", $mail);
+    $mail = $domain = $mailpart = '';
+    if (isset($this->parent->mail)) {
+      $mail = $this->parent->mail;
+      if (preg_match('/\@/', $mail)) {
+        list($mailpart,$domain) = explode('@', $mail);
+      }
     }
 
     /* Create account_id
@@ -424,10 +426,12 @@ class mailMethod
     $prefix     = preg_replace("/\\\\([\.\/])/", "\\1", $prefix);
     $acc_string = preg_replace("/\\\\([\.\/])/", "\\1", $acc_string);
 
-    $domain = $mailpart = "";
-    $mail = $this->parent->mail;
-    if (preg_match("/\@/", $mail)) {
-      list($mailpart,$domain) = explode("@", $mail);
+    $mail = $domain = $mailpart = '';
+    if (isset($this->parent->mail)) {
+      $mail = $this->parent->mail;
+      if (preg_match('/\@/', $mail)) {
+        list($mailpart,$domain) = explode('@', $mail);
+      }
     }
 
     /* Create account_id */
@@ -456,37 +460,6 @@ class mailMethod
     return $str;
   }
 
-  /*! \brief  Returns the configured mail method for the given parent object,
-                initialized and read for use.
-      @return mailMethod  The configured mailMethod.
-   */
-  public function get_method()
-  {
-    global $config;
-    $methods = mailMethod::get_methods();
-    if ($config->get_cfg_value('mailmethod') != '') {
-      $method = $config->get_cfg_value('mailmethod');
-      $cls = get_correct_class_name('mailMethod$method');
-      if (isset($methods[$cls])) {
-        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $cls, '<b>MAIL:</b> Selected mailMethod');
-        $tmp = new $cls($this->parent, $this->type);
-        $tmp->init();
-        return $tmp;
-      } else {
-        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, '', '<b>MAIL: Invalid mailMethod defined: '.$cls.
-            ' falling back to '.get_class($this).'</b>');
-
-        /* Print out configuration errors directly, we can't catch them everywhere */
-        msg_dialog::display(_('Configuration error'),
-            sprintf(_('Mail method "%s" is unknown!'), $method), ERROR_DIALOG);
-      }
-    }
-
-    /* If no valued mailMethod could be detected, return the base class */
-    $this->init();
-    return $this;
-  }
-
   /*! \brief Saves sieve settings
    */
   public function saveSieveSettings()
@@ -665,9 +638,14 @@ class mailMethod
     return isset(static::get_server_list()[$server]);
   }
 
-  static public function getInstance($class, $parent)
+  static public function getInstance($class, $parent, $type = NULL)
   {
-    $obj = new $class($parent);
+    if ($parent instanceof mailAccount) {
+      $type = 'user';
+    } elseif ($type === NULL) {
+      $type = 'group';
+    }
+    $obj = new $class($parent, $type);
     $obj->init();
     return $obj;
   }
diff --git a/mixedgroups/locale/ar/fusiondirectory.po b/mixedgroups/locale/ar/fusiondirectory.po
index 4e2e298bc6f952671c560f3cf457d67340780313..17662916df11a040cf467cbb9a2b3796fd5d4b77 100644
--- a/mixedgroups/locale/ar/fusiondirectory.po
+++ b/mixedgroups/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/mixedgroups/locale/ca/fusiondirectory.po b/mixedgroups/locale/ca/fusiondirectory.po
index 2b0b8c0869665f4653735415b2860bc9ca546606..a98b28268759958b05e3a1e5959f66c382c87c90 100644
--- a/mixedgroups/locale/ca/fusiondirectory.po
+++ b/mixedgroups/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/cs_CZ/fusiondirectory.po b/mixedgroups/locale/cs_CZ/fusiondirectory.po
index c2e9a704678e3260647783e6ac21b533fafbc92b..3713dfdf8cc09a149c538b8b9d43a5e30b8615b9 100644
--- a/mixedgroups/locale/cs_CZ/fusiondirectory.po
+++ b/mixedgroups/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/mixedgroups/locale/de/fusiondirectory.po b/mixedgroups/locale/de/fusiondirectory.po
index 8faa17d53bcd761ecb399639ca95e20c528521fe..1edbb2ef16198c7c6277972720f241c867b2e21c 100644
--- a/mixedgroups/locale/de/fusiondirectory.po
+++ b/mixedgroups/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/mixedgroups/locale/el_GR/fusiondirectory.po b/mixedgroups/locale/el_GR/fusiondirectory.po
index 2746f88b217dea5e287c9af091f58f4b48ab0da0..0eeb7efc03a88db0ca3501ffe575468fac21a469 100644
--- a/mixedgroups/locale/el_GR/fusiondirectory.po
+++ b/mixedgroups/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/mixedgroups/locale/en/fusiondirectory.po b/mixedgroups/locale/en/fusiondirectory.po
index 9aad81da9d9a9acbf2ca36cb792acdf44d57d837..d2f73b5cba2e40428231098cb422d990e37076d6 100644
--- a/mixedgroups/locale/en/fusiondirectory.po
+++ b/mixedgroups/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/mixedgroups/locale/es/fusiondirectory.po b/mixedgroups/locale/es/fusiondirectory.po
index 2a77e8a76e326356429d3649dd6b87873719fec9..4037ebacf0e2eab75a0432099e579acb5246ab8c 100644
--- a/mixedgroups/locale/es/fusiondirectory.po
+++ b/mixedgroups/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/mixedgroups/locale/es_CO/fusiondirectory.po b/mixedgroups/locale/es_CO/fusiondirectory.po
index 8c3ca06b1fa38c23c1379f4f286c9e1b3abd0d49..20e3cb212487bd49cf91b3983d0bed012096e27c 100644
--- a/mixedgroups/locale/es_CO/fusiondirectory.po
+++ b/mixedgroups/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/mixedgroups/locale/es_VE/fusiondirectory.po b/mixedgroups/locale/es_VE/fusiondirectory.po
index 40ed46d5b41d1567575c13e3eceb1f7e560c0ca4..1bd45073c897b6733b6d589fe5f4ee9d45fdeedf 100644
--- a/mixedgroups/locale/es_VE/fusiondirectory.po
+++ b/mixedgroups/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/mixedgroups/locale/fa_IR/fusiondirectory.po b/mixedgroups/locale/fa_IR/fusiondirectory.po
index 31e07a8166cfe1b58ce79cb6ee6f6558f607839f..98b8587503a754c58b23cd021625684cfc20c3ae 100644
--- a/mixedgroups/locale/fa_IR/fusiondirectory.po
+++ b/mixedgroups/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/fi_FI/fusiondirectory.po b/mixedgroups/locale/fi_FI/fusiondirectory.po
index ed6d3277cf1f8c29eb6adca94c01ebd61172c218..fa74373f148e0f4f07db654bef32e662510779bc 100644
--- a/mixedgroups/locale/fi_FI/fusiondirectory.po
+++ b/mixedgroups/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/mixedgroups/locale/fr/fusiondirectory.po b/mixedgroups/locale/fr/fusiondirectory.po
index a1385f4e5ced4663ade4dabfac0a43351a8f2e0e..04a885fe00d88e3ec6c107f6753c17e86e7fc85e 100644
--- a/mixedgroups/locale/fr/fusiondirectory.po
+++ b/mixedgroups/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/mixedgroups/locale/hu_HU/fusiondirectory.po b/mixedgroups/locale/hu_HU/fusiondirectory.po
index 2d95dda3fbe67342b980d8ca66a19bd57ef9f4c8..4b0d6e7fcf9b9d14d4caf2ffbfdb15a110371ded 100644
--- a/mixedgroups/locale/hu_HU/fusiondirectory.po
+++ b/mixedgroups/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/id/fusiondirectory.po b/mixedgroups/locale/id/fusiondirectory.po
index c2aee0f44e9737181b450d8682671a3783cce4c7..2295c122771064f4c8104799b7ac9b7b4225e49f 100644
--- a/mixedgroups/locale/id/fusiondirectory.po
+++ b/mixedgroups/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/it_IT/fusiondirectory.po b/mixedgroups/locale/it_IT/fusiondirectory.po
index 9319e25ff3eec2523debd8acc7b26aae92442810..826456de43103dfbaa2e0b58b1286ec0cfcc940e 100644
--- a/mixedgroups/locale/it_IT/fusiondirectory.po
+++ b/mixedgroups/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/mixedgroups/locale/lv/fusiondirectory.po b/mixedgroups/locale/lv/fusiondirectory.po
index 0d56d2ff6ade3a3d0cc79f5896411a2e7af27a13..b7a2804f1737e0669c820d07ca770ee875dae0eb 100644
--- a/mixedgroups/locale/lv/fusiondirectory.po
+++ b/mixedgroups/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/nb/fusiondirectory.po b/mixedgroups/locale/nb/fusiondirectory.po
index fbf61ae3e7c2f0dea524c93b6dbd87b514cb177b..5913e431f57935ead72c06ba8cf5380949577cc9 100644
--- a/mixedgroups/locale/nb/fusiondirectory.po
+++ b/mixedgroups/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/mixedgroups/locale/nl/fusiondirectory.po b/mixedgroups/locale/nl/fusiondirectory.po
index 5c30423c42b30f25f2b5d5c349c7a195e3c2195f..66c0ed73d7ad32a8294b6c2f9fe6e16715f30a1e 100644
--- a/mixedgroups/locale/nl/fusiondirectory.po
+++ b/mixedgroups/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/mixedgroups/locale/pl/fusiondirectory.po b/mixedgroups/locale/pl/fusiondirectory.po
index ad73af0358510d89e23bb1cc690f7144aeecb4bd..ed1f0a31f1479688eacbb79b4d674ec4056f233a 100644
--- a/mixedgroups/locale/pl/fusiondirectory.po
+++ b/mixedgroups/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
diff --git a/mixedgroups/locale/pt/fusiondirectory.po b/mixedgroups/locale/pt/fusiondirectory.po
index 7ca4e2de159492f70220d227f0919bcbf70a970f..8813b0f32645151cd056d7d6e3a0243e817e63ca 100644
--- a/mixedgroups/locale/pt/fusiondirectory.po
+++ b/mixedgroups/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/mixedgroups/locale/pt_BR/fusiondirectory.po b/mixedgroups/locale/pt_BR/fusiondirectory.po
index ff84063f828ec4638d7b1027a40aed9906b1ce13..36f4cdd44ac85059fe92d5a22e9175e346cda3ca 100644
--- a/mixedgroups/locale/pt_BR/fusiondirectory.po
+++ b/mixedgroups/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/mixedgroups/locale/ru/fusiondirectory.po b/mixedgroups/locale/ru/fusiondirectory.po
index 7544ed252c57fc564182a6289cc7dee0cc7235e9..e1e484afaaf388ca9f1f45d740aeb208eb5dbeff 100644
--- a/mixedgroups/locale/ru/fusiondirectory.po
+++ b/mixedgroups/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/mixedgroups/locale/ru@petr1708/fusiondirectory.po b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
index 83a87a8a7ce796b44c29051e5ac5bb4c0854b003..fa18eb3eb971c42e101f3a29ea65b463000062a8 100644
--- a/mixedgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/sv/fusiondirectory.po b/mixedgroups/locale/sv/fusiondirectory.po
index 6d3bd5546b3b7a2d3e570970fb61e6f15259d1b6..1ee5e28166137c96d3739004784be965fc831649 100644
--- a/mixedgroups/locale/sv/fusiondirectory.po
+++ b/mixedgroups/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/mixedgroups/locale/ug/fusiondirectory.po b/mixedgroups/locale/ug/fusiondirectory.po
index 34cb90be07ad7a252cf86a9ca851d9c1afdb9991..f7cddc5e09748a6734301d3b28b2fde5c08ec3c8 100644
--- a/mixedgroups/locale/ug/fusiondirectory.po
+++ b/mixedgroups/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/vi_VN/fusiondirectory.po b/mixedgroups/locale/vi_VN/fusiondirectory.po
index 59be9a08767c8751137d0b6113bbb2cf8b5d0d30..0e4769bb01bab64a1696b5435c251712703b58db 100644
--- a/mixedgroups/locale/vi_VN/fusiondirectory.po
+++ b/mixedgroups/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/mixedgroups/locale/zh/fusiondirectory.po b/mixedgroups/locale/zh/fusiondirectory.po
index e9c2040f38fea9223c2bc6c26cc68977130d5836..a79e640ee28cb74a7392ef4ab95da1fab5ed5cb2 100644
--- a/mixedgroups/locale/zh/fusiondirectory.po
+++ b/mixedgroups/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/nagios/locale/ar/fusiondirectory.po b/nagios/locale/ar/fusiondirectory.po
index 4807e1535fd77145cc3e7f5a9ed5103bf2cc9d00..1d1551ac70bc9a9508323650174ef3e8afd44b0b 100644
--- a/nagios/locale/ar/fusiondirectory.po
+++ b/nagios/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/ca/fusiondirectory.po b/nagios/locale/ca/fusiondirectory.po
index 1b054964de9539fcf04ba789ae21a33dee8f4182..b974dff74665216259028632320265c09fb28f33 100644
--- a/nagios/locale/ca/fusiondirectory.po
+++ b/nagios/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/nagios/locale/cs_CZ/fusiondirectory.po b/nagios/locale/cs_CZ/fusiondirectory.po
index 8139c770fe3fbe151e78fa480137e695db10cda9..7ac5bbfc6bb631170d14e330fcd784c819e10af4 100644
--- a/nagios/locale/cs_CZ/fusiondirectory.po
+++ b/nagios/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/nagios/locale/de/fusiondirectory.po b/nagios/locale/de/fusiondirectory.po
index 631c915814d1a238df60eccda217ca0357035368..f5ca0d0a861a634be8ad48947892b15c584ffeb9 100644
--- a/nagios/locale/de/fusiondirectory.po
+++ b/nagios/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/nagios/locale/el_GR/fusiondirectory.po b/nagios/locale/el_GR/fusiondirectory.po
index 9d1e6d1a73a1eed4c1d0e3b6ce04824fc4f8635f..885545a3feb2a2442da79f0c47a79b8d142bade1 100644
--- a/nagios/locale/el_GR/fusiondirectory.po
+++ b/nagios/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/nagios/locale/en/fusiondirectory.po b/nagios/locale/en/fusiondirectory.po
index 07162bee17dbff5652f3a8b68e8ef1a745e29741..d060d13704f4c8176aeac66b1af3aad802d0b6b4 100644
--- a/nagios/locale/en/fusiondirectory.po
+++ b/nagios/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/nagios/locale/es/fusiondirectory.po b/nagios/locale/es/fusiondirectory.po
index 934be796dfd3e10040367923c2ba2362301409c9..7f2e0d5870697642704e3abb10c06d909e333edd 100644
--- a/nagios/locale/es/fusiondirectory.po
+++ b/nagios/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/nagios/locale/es_CO/fusiondirectory.po b/nagios/locale/es_CO/fusiondirectory.po
index 23f5398e0366cb84f8c7b2f860a8394c175ee360..b6aaa24a21edc278bea17810420c63a058fc2bf2 100644
--- a/nagios/locale/es_CO/fusiondirectory.po
+++ b/nagios/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/nagios/locale/es_VE/fusiondirectory.po b/nagios/locale/es_VE/fusiondirectory.po
index 491d05048a367b7f5aecc14479d00a0eb8171577..4a8bcf3bcf99c52b691bfcccf5fcefb7092ba973 100644
--- a/nagios/locale/es_VE/fusiondirectory.po
+++ b/nagios/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/nagios/locale/fa_IR/fusiondirectory.po b/nagios/locale/fa_IR/fusiondirectory.po
index 323ddc46f9d8b17ae24ee510b3a4607d6d1288c7..0d3bf6afec13f963baa0d47610c638a2d7a4b6d8 100644
--- a/nagios/locale/fa_IR/fusiondirectory.po
+++ b/nagios/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/nagios/locale/fi_FI/fusiondirectory.po b/nagios/locale/fi_FI/fusiondirectory.po
index d4be1f2904e2bafd579ab49b1dfa2aa8a2880bb0..fc93aef80d84508b235fc24bec853c32fc2e092f 100644
--- a/nagios/locale/fi_FI/fusiondirectory.po
+++ b/nagios/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/fr/fusiondirectory.po b/nagios/locale/fr/fusiondirectory.po
index 7cd97e540b47db781a51f1e0f5b97091a123a35d..e779f9943bbc9e4602d19ab81a336ef78a77c99e 100644
--- a/nagios/locale/fr/fusiondirectory.po
+++ b/nagios/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/nagios/locale/hu_HU/fusiondirectory.po b/nagios/locale/hu_HU/fusiondirectory.po
index efe36514f0cd00fd29eb93f7faea423cae01db9c..561ddf9942e4d803134dc9b4a0751be1dcd66d0f 100644
--- a/nagios/locale/hu_HU/fusiondirectory.po
+++ b/nagios/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/id/fusiondirectory.po b/nagios/locale/id/fusiondirectory.po
index 184b0267adc6482790b8c8797e02fb1a0b3dd26a..ea7907f5c7419ac07ca86eb9b1defd1136f74393 100644
--- a/nagios/locale/id/fusiondirectory.po
+++ b/nagios/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/it_IT/fusiondirectory.po b/nagios/locale/it_IT/fusiondirectory.po
index f2eebfe917604fb86e7c8711436b89321be864e6..4bd6fe0efe63659c4708b74728d48d64ef1646ab 100644
--- a/nagios/locale/it_IT/fusiondirectory.po
+++ b/nagios/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/nagios/locale/lv/fusiondirectory.po b/nagios/locale/lv/fusiondirectory.po
index ff9888bc42c681ac94f7de6b5c4b7493b2fe70e1..52fdddc370144a60f8905bb0ad713b2680d42efe 100644
--- a/nagios/locale/lv/fusiondirectory.po
+++ b/nagios/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/nagios/locale/nb/fusiondirectory.po b/nagios/locale/nb/fusiondirectory.po
index f022e69242f388bf099bd77985ae3c649c990ce3..ddbef0f0986599a50cd84b3d448d0314cea5113e 100644
--- a/nagios/locale/nb/fusiondirectory.po
+++ b/nagios/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/nl/fusiondirectory.po b/nagios/locale/nl/fusiondirectory.po
index 18d7733c4e6f4c18a11b38fbb896a5044e4bf757..e59be351deee541d4c4f8fbfa7d222d173e1f67e 100644
--- a/nagios/locale/nl/fusiondirectory.po
+++ b/nagios/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/nagios/locale/pl/fusiondirectory.po b/nagios/locale/pl/fusiondirectory.po
index 0b6c36841836660aeea431376f1aa8de8188e2a1..c8cc294ff8b354fa05a1ee0539e31f02126fd2de 100644
--- a/nagios/locale/pl/fusiondirectory.po
+++ b/nagios/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/nagios/class_nagiosAccount.inc:40
 #: config/nagios/class_nagiosConfig.inc:42
diff --git a/nagios/locale/pt/fusiondirectory.po b/nagios/locale/pt/fusiondirectory.po
index 887012d1883bc90cb42c4ed87e29060f48550457..5b2611f1c9e7357592df785636fb95a1a3f45124 100644
--- a/nagios/locale/pt/fusiondirectory.po
+++ b/nagios/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/nagios/locale/pt_BR/fusiondirectory.po b/nagios/locale/pt_BR/fusiondirectory.po
index 6e9fde9f6491d3bb8c727c4cb38d89619356f57e..0de9302a719b03de4c494711fa1c63edc038213a 100644
--- a/nagios/locale/pt_BR/fusiondirectory.po
+++ b/nagios/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/nagios/locale/ru/fusiondirectory.po b/nagios/locale/ru/fusiondirectory.po
index 89e4f428a300d79e6b8f6225d7926bee80a4dec8..bca448610ccd75f6cbe6db60d6d618da4e73cffe 100644
--- a/nagios/locale/ru/fusiondirectory.po
+++ b/nagios/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/nagios/locale/ru@petr1708/fusiondirectory.po b/nagios/locale/ru@petr1708/fusiondirectory.po
index 84402fc6a2e3acb2adde229de39f4d15b5bea3db..48e76e7bc9c67ae8b6d29bd780c1494bf45c0f45 100644
--- a/nagios/locale/ru@petr1708/fusiondirectory.po
+++ b/nagios/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/sv/fusiondirectory.po b/nagios/locale/sv/fusiondirectory.po
index 34d1217b5c253aff080e15ae136891fb0558a76f..ad0f1962038de7b56e70c53285f79a14d759667c 100644
--- a/nagios/locale/sv/fusiondirectory.po
+++ b/nagios/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/nagios/locale/ug/fusiondirectory.po b/nagios/locale/ug/fusiondirectory.po
index 77faf8ec59ed3e1737827a195fef7f641762688b..352b72c8e2a8121c289aef40840d35e4d7f9fab8 100644
--- a/nagios/locale/ug/fusiondirectory.po
+++ b/nagios/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/vi_VN/fusiondirectory.po b/nagios/locale/vi_VN/fusiondirectory.po
index f2183314cad804ae6c6be02cb1c1733263a9a860..b6df454f0727e5230c33250bf42acee380898118 100644
--- a/nagios/locale/vi_VN/fusiondirectory.po
+++ b/nagios/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/nagios/locale/zh/fusiondirectory.po b/nagios/locale/zh/fusiondirectory.po
index 89999066d891817e5f50141a4c8315e3017462a9..72327cc7c63daf03abd1cc077821a35405591742 100644
--- a/nagios/locale/zh/fusiondirectory.po
+++ b/nagios/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/netgroups/locale/ar/fusiondirectory.po b/netgroups/locale/ar/fusiondirectory.po
index f4277654c843b9c092fa8070a2611e99c03424ce..614025387da8695f4b12e9ed9489f9ad0f4f6409 100644
--- a/netgroups/locale/ar/fusiondirectory.po
+++ b/netgroups/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/netgroups/locale/ca/fusiondirectory.po b/netgroups/locale/ca/fusiondirectory.po
index 99eaa981cfa851a434fc0cc7aa56f92107e57098..dd884ae920752cfaec5f5c07e0186ff2b685ac21 100644
--- a/netgroups/locale/ca/fusiondirectory.po
+++ b/netgroups/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/netgroups/locale/cs_CZ/fusiondirectory.po b/netgroups/locale/cs_CZ/fusiondirectory.po
index ff07144e601ed785a5755e63eca4a20e4ce9910b..916e762f689e2013070fc708758a33a74248ea9c 100644
--- a/netgroups/locale/cs_CZ/fusiondirectory.po
+++ b/netgroups/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/netgroups/locale/de/fusiondirectory.po b/netgroups/locale/de/fusiondirectory.po
index 89fb8b254d965257602ac132f593cec0683594f5..d60b68e85713d894950ceb369d5ae026e265b9bb 100644
--- a/netgroups/locale/de/fusiondirectory.po
+++ b/netgroups/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/netgroups/locale/el_GR/fusiondirectory.po b/netgroups/locale/el_GR/fusiondirectory.po
index 6a2f186323377676f36b677c3f5d23ecd7c8eff9..10e68cb8b6e24d5d4281ce32836681ee1e557b32 100644
--- a/netgroups/locale/el_GR/fusiondirectory.po
+++ b/netgroups/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/netgroups/locale/en/fusiondirectory.po b/netgroups/locale/en/fusiondirectory.po
index 544b1b4fa337950e5c18a0ecbd812301f87920b5..1dee67ec91e9e2e2a6cb0b33a4f7ffacb5319188 100644
--- a/netgroups/locale/en/fusiondirectory.po
+++ b/netgroups/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/netgroups/locale/es/fusiondirectory.po b/netgroups/locale/es/fusiondirectory.po
index 5c088ea17a6abd59083fca86627fda4b043fe429..388289cf31ccf9f0a055fdf70a978aaf140e8883 100644
--- a/netgroups/locale/es/fusiondirectory.po
+++ b/netgroups/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/netgroups/locale/es_CO/fusiondirectory.po b/netgroups/locale/es_CO/fusiondirectory.po
index b9a87b9f6d8395290878554840494e204067d85f..1342663192f5d3ce5b52854dcf894297ec8da5cb 100644
--- a/netgroups/locale/es_CO/fusiondirectory.po
+++ b/netgroups/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/netgroups/locale/es_VE/fusiondirectory.po b/netgroups/locale/es_VE/fusiondirectory.po
index 0e3e7cf7e018cf9ace2fe3e664f0aca6d3a2adbb..e3d0890699e1ac575eb05b214dc851487624bcdf 100644
--- a/netgroups/locale/es_VE/fusiondirectory.po
+++ b/netgroups/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/netgroups/locale/fa_IR/fusiondirectory.po b/netgroups/locale/fa_IR/fusiondirectory.po
index 2d3c55b55747454524d474f298dfa7eb0b84fc41..b860e538183d7026df2ee55a572f41b68831963e 100644
--- a/netgroups/locale/fa_IR/fusiondirectory.po
+++ b/netgroups/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/fi_FI/fusiondirectory.po b/netgroups/locale/fi_FI/fusiondirectory.po
index 51f786c8957a0b2a71debae1cd1c4e1e058e1acd..f636d3129d9c451af197f04d84ca811246426738 100644
--- a/netgroups/locale/fi_FI/fusiondirectory.po
+++ b/netgroups/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/netgroups/locale/fr/fusiondirectory.po b/netgroups/locale/fr/fusiondirectory.po
index 8dd6a69763214b836f3bd4bcb2431118edc3bb04..83b8dcac8e7e8f489ae17d18f846419b75e586ff 100644
--- a/netgroups/locale/fr/fusiondirectory.po
+++ b/netgroups/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgstr "Configuration Netgroup"
 
 #: config/netgroups/class_netgroupConfig.inc:29
 msgid "FusionDirectory netgroup plugin configuration"
-msgstr "Configuration du plugin Netgroup"
+msgstr "Configuration du plugin netgroup"
 
 #: config/netgroups/class_netgroupConfig.inc:42
 #: admin/netgroups/class_netgroup.inc:50
@@ -52,11 +52,11 @@ msgstr "Netgroup"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Netgroup RDN"
-msgstr "Chemin relatif des objets Netgroup"
+msgstr "Branche Netgroup"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Branch in which netgroups will be stored"
-msgstr "Branches ou seront stockés les objets Netgroup"
+msgstr "Branche ou seront stockés les objets Netgroup"
 
 #: admin/netgroups/class_netgroup.inc:51
 msgid "NIS Netgroup settings"
diff --git a/netgroups/locale/hu_HU/fusiondirectory.po b/netgroups/locale/hu_HU/fusiondirectory.po
index 8a56bd25e6fa2e4bb297906bc67b8180bc27ec75..a9d382c6f037d58eed9f4f3d46c41caa00cf3153 100644
--- a/netgroups/locale/hu_HU/fusiondirectory.po
+++ b/netgroups/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/netgroups/locale/id/fusiondirectory.po b/netgroups/locale/id/fusiondirectory.po
index 8999bf6043d6f3c77857da3fd6cf6fb22837bf99..bf28f9c4b4916f85f2310be2d10a44434f514923 100644
--- a/netgroups/locale/id/fusiondirectory.po
+++ b/netgroups/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/it_IT/fusiondirectory.po b/netgroups/locale/it_IT/fusiondirectory.po
index 5ff1a23d3ef3fa0fbe03c9acbf229dbf912d31ea..3d39baccce989d9b22add0d7513e4dc25faa0f6a 100644
--- a/netgroups/locale/it_IT/fusiondirectory.po
+++ b/netgroups/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/netgroups/locale/lv/fusiondirectory.po b/netgroups/locale/lv/fusiondirectory.po
index 52cff4b3df0dbea03e9264e5c415b3135aa3003e..d9f12a603fbc1cf926a26b43eac2066be3d757ff 100644
--- a/netgroups/locale/lv/fusiondirectory.po
+++ b/netgroups/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/netgroups/locale/nb/fusiondirectory.po b/netgroups/locale/nb/fusiondirectory.po
index b8ade3f19282da57f6c06c006d30c42647a25091..2536f205a957beb026149d27c39ec1ee3ed06df7 100644
--- a/netgroups/locale/nb/fusiondirectory.po
+++ b/netgroups/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/netgroups/locale/nl/fusiondirectory.po b/netgroups/locale/nl/fusiondirectory.po
index 205e6e5e90d689b96e24eaf1110efcb31523ccc9..89dcb4a53339085c71e0013277cd67ce89095330 100644
--- a/netgroups/locale/nl/fusiondirectory.po
+++ b/netgroups/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/netgroups/locale/pl/fusiondirectory.po b/netgroups/locale/pl/fusiondirectory.po
index 82b8d6c11544c1d89645fa575cfb1cfeb701b3cf..c514b5debc5d370ddd35a999d0c270b42cf1ce5d 100644
--- a/netgroups/locale/pl/fusiondirectory.po
+++ b/netgroups/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/netgroups/class_netgroupMembership.inc:43
 #: admin/netgroups/class_netgroup.inc:54
diff --git a/netgroups/locale/pt/fusiondirectory.po b/netgroups/locale/pt/fusiondirectory.po
index 5ae3577cbc1aa2270ddd92877e79850c0a95fee5..cb52463f5f4a4f727f73547bf609428f1028ddbc 100644
--- a/netgroups/locale/pt/fusiondirectory.po
+++ b/netgroups/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/netgroups/locale/pt_BR/fusiondirectory.po b/netgroups/locale/pt_BR/fusiondirectory.po
index 6801e0edc3c7bdc78f658e569f7f70af25489ca4..400100d95989a15d733986a07fe79d54e54451e3 100644
--- a/netgroups/locale/pt_BR/fusiondirectory.po
+++ b/netgroups/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/netgroups/locale/ru/fusiondirectory.po b/netgroups/locale/ru/fusiondirectory.po
index 56d3a5875413855c90d5be8be3f8d2208be70e41..1642bf37c619e8b0e8f0746aa29db55c9e7b4d87 100644
--- a/netgroups/locale/ru/fusiondirectory.po
+++ b/netgroups/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/netgroups/locale/ru@petr1708/fusiondirectory.po b/netgroups/locale/ru@petr1708/fusiondirectory.po
index fe4aa5a86c2bcffcc604da78f69f06f0f8686dde..d7b405bb6ed3784854974eb0d1981ff48c34b0ff 100644
--- a/netgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/netgroups/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/sv/fusiondirectory.po b/netgroups/locale/sv/fusiondirectory.po
index 42fc5964f70cdce63eae113dbb83f042dced65da..640f70b953f980367d8fd8385287efae4acf2833 100644
--- a/netgroups/locale/sv/fusiondirectory.po
+++ b/netgroups/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/netgroups/locale/ug/fusiondirectory.po b/netgroups/locale/ug/fusiondirectory.po
index dc52dfda39a9e94d5401fd69c1800775011859be..322aa9b8e986872338bdf44ace83c1ea38ff09df 100644
--- a/netgroups/locale/ug/fusiondirectory.po
+++ b/netgroups/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/vi_VN/fusiondirectory.po b/netgroups/locale/vi_VN/fusiondirectory.po
index e10fa7ad14ee86c901d419d30ff67631b36bbeca..593334c15b1e8781da07ad764439908d320acebc 100644
--- a/netgroups/locale/vi_VN/fusiondirectory.po
+++ b/netgroups/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/netgroups/locale/zh/fusiondirectory.po b/netgroups/locale/zh/fusiondirectory.po
index a3ae370ba05506a6bed5b9cb9c9f99291f9016b5..437ff5d4bcfc3d64600b9bd698193e4789624d35 100644
--- a/netgroups/locale/zh/fusiondirectory.po
+++ b/netgroups/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/newsletter/locale/ar/fusiondirectory.po b/newsletter/locale/ar/fusiondirectory.po
index 64a4a1d64f690db3254ce2d062a44b59755f472c..98f021e99c5b47938ae2a2b72cfdfed37201db91 100644
--- a/newsletter/locale/ar/fusiondirectory.po
+++ b/newsletter/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/ca/fusiondirectory.po b/newsletter/locale/ca/fusiondirectory.po
index ccb4d75e5245947430971cb30a94ec7d872a91dd..e3bd360e22af57092ac25d3f47460c353f8a2e22 100644
--- a/newsletter/locale/ca/fusiondirectory.po
+++ b/newsletter/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/cs_CZ/fusiondirectory.po b/newsletter/locale/cs_CZ/fusiondirectory.po
index 09fbdac1ed09bff31ed244de321a97dec8466dff..28a10b57ada3445eb5543400574a61e66b8b97b9 100644
--- a/newsletter/locale/cs_CZ/fusiondirectory.po
+++ b/newsletter/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/newsletter/locale/de/fusiondirectory.po b/newsletter/locale/de/fusiondirectory.po
index f7d6879c6d933f8ef7758e59b620c87d1dc73c61..97aa3dac017b94eb0b9eb1b5b26e27df791b38ca 100644
--- a/newsletter/locale/de/fusiondirectory.po
+++ b/newsletter/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/newsletter/locale/el_GR/fusiondirectory.po b/newsletter/locale/el_GR/fusiondirectory.po
index cd534936d189b62fc311bbf68dffdca9f0a35c00..e5bea534512208fe2618584baa1aaefa71048cc3 100644
--- a/newsletter/locale/el_GR/fusiondirectory.po
+++ b/newsletter/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/newsletter/locale/en/fusiondirectory.po b/newsletter/locale/en/fusiondirectory.po
index dd03634fdb115cfcb08fe3f500ef477f7aeb9450..b9a688f1a7deb7dff64b222fd28ac3e1e8f80d70 100644
--- a/newsletter/locale/en/fusiondirectory.po
+++ b/newsletter/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/newsletter/locale/es/fusiondirectory.po b/newsletter/locale/es/fusiondirectory.po
index 4c817756d7b170bb25da7bb43d6e91ee9b7a3100..ab51525d24faa55c91519c3ecb38e9c386959091 100644
--- a/newsletter/locale/es/fusiondirectory.po
+++ b/newsletter/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/es_CO/fusiondirectory.po b/newsletter/locale/es_CO/fusiondirectory.po
index f09ffd2b13d7bff955b969e1aa3ec6661b9fe6f9..d90c9c6f43f4e590cc5eb30725a4729df52e9821 100644
--- a/newsletter/locale/es_CO/fusiondirectory.po
+++ b/newsletter/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/es_VE/fusiondirectory.po b/newsletter/locale/es_VE/fusiondirectory.po
index 8b3c1bed4aec1bc2bf8b0fb42c50bec33efd0fd6..e329885552f1be76c6cb55c71888d6cb4df0ab92 100644
--- a/newsletter/locale/es_VE/fusiondirectory.po
+++ b/newsletter/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/fa_IR/fusiondirectory.po b/newsletter/locale/fa_IR/fusiondirectory.po
index 7cb2cd69a3183619a59eb9f6756e9a3e503fae56..f2d9edaaa116406d548f2e98b67c8927f01128c3 100644
--- a/newsletter/locale/fa_IR/fusiondirectory.po
+++ b/newsletter/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/fi_FI/fusiondirectory.po b/newsletter/locale/fi_FI/fusiondirectory.po
index 1d56ee9531be9cddeae206ebac31e85e7c590b23..5df87956e82cafea772c17e439976719f3cc413e 100644
--- a/newsletter/locale/fi_FI/fusiondirectory.po
+++ b/newsletter/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/fr/fusiondirectory.po b/newsletter/locale/fr/fusiondirectory.po
index 66ad889853f1fae9f07b78f85db00645f43155f6..ecabeb26c9c712dc4a50ffef820326f2a3f462eb 100644
--- a/newsletter/locale/fr/fusiondirectory.po
+++ b/newsletter/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/newsletter/locale/hu_HU/fusiondirectory.po b/newsletter/locale/hu_HU/fusiondirectory.po
index 83dfcde08b091a638658e76da41f98e945507aa2..141d453914c9fbaf8a0abf9818704b5416df55c0 100644
--- a/newsletter/locale/hu_HU/fusiondirectory.po
+++ b/newsletter/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/id/fusiondirectory.po b/newsletter/locale/id/fusiondirectory.po
index 0b6c1b7a4afffd6a068b4585d3131299a116ca3c..a4d780b1a4c35a21e3fabf5722ccf2b28f6ca942 100644
--- a/newsletter/locale/id/fusiondirectory.po
+++ b/newsletter/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/it_IT/fusiondirectory.po b/newsletter/locale/it_IT/fusiondirectory.po
index c9999cd96038923743c0437386b357ce7853127d..41e2fb872c3ac856dc54924ad2fa393a3c593db9 100644
--- a/newsletter/locale/it_IT/fusiondirectory.po
+++ b/newsletter/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/newsletter/locale/lv/fusiondirectory.po b/newsletter/locale/lv/fusiondirectory.po
index 8b8244462fe2ddc65e52db7c60e96f51013a472f..6190f68de9cec95fba654a726eb554914f516df4 100644
--- a/newsletter/locale/lv/fusiondirectory.po
+++ b/newsletter/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/nb/fusiondirectory.po b/newsletter/locale/nb/fusiondirectory.po
index 1f6b1dd5e5e55e525246fa682db68d94d9b68d1b..752aedb40d4035ef5db7130273cb08c78dd942a0 100644
--- a/newsletter/locale/nb/fusiondirectory.po
+++ b/newsletter/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/nl/fusiondirectory.po b/newsletter/locale/nl/fusiondirectory.po
index 6a833839b5f721d84baa4c92896f4eb27a2c0750..e55073ee5e6aa12c4e6f1642392a78b0c5135399 100644
--- a/newsletter/locale/nl/fusiondirectory.po
+++ b/newsletter/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/newsletter/locale/pl/fusiondirectory.po b/newsletter/locale/pl/fusiondirectory.po
index 92c2e9062dba170193da85d6b13c10f4d3d8c8c5..4b300666ff655f9409115b186919b13b19323df4 100644
--- a/newsletter/locale/pl/fusiondirectory.po
+++ b/newsletter/locale/pl/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/newsletter/class_newsletterSubscriptions.inc:30
 #: config/newsletter/class_newsletterConfig.inc:41
diff --git a/newsletter/locale/pt/fusiondirectory.po b/newsletter/locale/pt/fusiondirectory.po
index 5bb1c549ad31b8b518eaea83fa9c31ebd7801667..6b80028afd0b76dab22748a58e0bd7514338a13d 100644
--- a/newsletter/locale/pt/fusiondirectory.po
+++ b/newsletter/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/pt_BR/fusiondirectory.po b/newsletter/locale/pt_BR/fusiondirectory.po
index cf37ffb170de245fca0c00def5adc85b66f6051b..e1680448f4091c49beadf7d627a23a92bf5a8a3e 100644
--- a/newsletter/locale/pt_BR/fusiondirectory.po
+++ b/newsletter/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/ru/fusiondirectory.po b/newsletter/locale/ru/fusiondirectory.po
index 0d672427fa41b7b13da3d10c649296b094642df6..9159a0d4bbccc436f728bf8ffa9869f3abb315d7 100644
--- a/newsletter/locale/ru/fusiondirectory.po
+++ b/newsletter/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/newsletter/locale/ru@petr1708/fusiondirectory.po b/newsletter/locale/ru@petr1708/fusiondirectory.po
index b531d750009b3170e24b5667b5c77bb47a73df2c..d68707ee23e60cc9cc3c91182c158a086a9e25c2 100644
--- a/newsletter/locale/ru@petr1708/fusiondirectory.po
+++ b/newsletter/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/sv/fusiondirectory.po b/newsletter/locale/sv/fusiondirectory.po
index 774dedbe8ed13d08dde44e1dadca839f6a78920d..2dd8b841bb7485160dbd1606d7f54ec0bd78d539 100644
--- a/newsletter/locale/sv/fusiondirectory.po
+++ b/newsletter/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/ug/fusiondirectory.po b/newsletter/locale/ug/fusiondirectory.po
index cfaeeb31104bd4d85eaff4f91746618dd7eb846b..c59f5fe9babd417d8e6c9d7c62506c32fcf78baf 100644
--- a/newsletter/locale/ug/fusiondirectory.po
+++ b/newsletter/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/vi_VN/fusiondirectory.po b/newsletter/locale/vi_VN/fusiondirectory.po
index ce3d45c5f79b238d69676fbf757864b877ea5cd6..a3a7dcc7233f5c7519d4307f3741bc31d27a3eb5 100644
--- a/newsletter/locale/vi_VN/fusiondirectory.po
+++ b/newsletter/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/zh/fusiondirectory.po b/newsletter/locale/zh/fusiondirectory.po
index da38de65988e3420cea6afdd8245c469e1fc8c3c..29adde9432a0972e0746b9743e647fd57ac3f99f 100644
--- a/newsletter/locale/zh/fusiondirectory.po
+++ b/newsletter/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/opsi/admin/opsi/class_opsiSoftwareList.inc b/opsi/admin/opsi/class_opsiSoftwareList.inc
index c65b3f26971b2792f55c4aab409aaf11acc45ddb..1d65115e36490d8c8cb8f423313ae3752732a3bd 100644
--- a/opsi/admin/opsi/class_opsiSoftwareList.inc
+++ b/opsi/admin/opsi/class_opsiSoftwareList.inc
@@ -101,7 +101,7 @@ class opsiSoftwareList extends simplePlugin
   {
     global $config;
     if ($opsi_args == NULL) {
-      $opsi_args = array('id','name','setupScript','alwaysScript','onceScript','customScript','userLoginScript','updateScript');
+      $opsi_args = array('id','name','setupScript','alwaysScript','onceScript','customScript','userLoginScript','updateScript','productVersion','packageVersion');
     }
     if (!isset($this->products[$this->fdOpsiServerDN])) {
       $s_daemon = new supportDaemon();
@@ -144,8 +144,14 @@ class opsiSoftwareList extends simplePlugin
         $this->products[$this->fdOpsiServerDN]['localboots'][$localboot['id']] = $localboot;
       }
     }
-    $choices = array_keys($this->products[$this->fdOpsiServerDN]['localboots']);
-    $this->attributesAccess['fdOpsiLocalbootProduct']->attribute->attributes[0]->setChoices($choices);
+    $choices = array();
+    foreach ($this->products[$this->fdOpsiServerDN]['localboots'] as $id => $infos) {
+      $choices[$id] = sprintf(_('%s (%s-%s)'), $infos['id'], $infos['productVersion'], $infos['packageVersion']);
+    }
+    $this->attributesAccess['fdOpsiLocalbootProduct']->attribute->attributes[0]->setChoices(
+      array_keys($choices),
+      array_values($choices)
+    );
   }
 
   public function product_changed ()
diff --git a/opsi/admin/systems/opsi/class_opsiClient.inc b/opsi/admin/systems/opsi/class_opsiClient.inc
index a57ea22c00fa21faa469921d6dc7450315ac30fb..7ea92a859dae388a6c647c0e5ca2cd3e17a38927 100644
--- a/opsi/admin/systems/opsi/class_opsiClient.inc
+++ b/opsi/admin/systems/opsi/class_opsiClient.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2017  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -77,18 +77,13 @@ class opsiClient extends simplePlugin
   function save()
   {
     global $config;
-    if ($this->initially_was_account && $this->editing_group()) {
+    if ($this->initially_was_account && $this->editing_group() && !$this->is_template) {
       $oldMembers = array_diff($this->initialMembers, $this->parent->getBaseObject()->member);
       $macAddresses = array();
       $ldap = $config->get_ldap_link();
       foreach ($oldMembers as $member) {
         $ldap->cat($member, array('macAddress'), '(&(!(objectClass=opsiClient))(macAddress=*))');
-        if (!$ldap->success()) {
-          msg_dialog::display(
-            _("Could not get macAddress for $member"),
-            msgPool::ldaperror($ldap->get_error()), ERROR_DIALOG
-          );
-        } elseif ($attrs = $ldap->fetch()) {
+        if ($attrs = $ldap->fetch()) {
           $macAddresses[] = $attrs['macAddress'][0];
         }
       }
@@ -98,7 +93,7 @@ class opsiClient extends simplePlugin
           $serverMac = $attrs['macAddress'][0];
         } else {
           msg_dialog::display(
-            _("Could not get macAddress for OPSI server !"),
+            _('Could not get macAddress for OPSI server!'),
             msgPool::ldaperror($ldap->get_error()), ERROR_DIALOG
           );
         }
@@ -120,7 +115,7 @@ class opsiClient extends simplePlugin
       return $errors;
     }
 
-    if ($this->is_account) {
+    if ($this->is_account && !$this->is_template) {
       $this->update_or_insert();
     }
   }
@@ -138,12 +133,12 @@ class opsiClient extends simplePlugin
           $macAddresses[] = $attrs['macAddress'][0];
         } else {
           if ($ldap->success()) {
-            $error = "$member was not found!";
+            $error = _('This member was not found or has no macAddress');
           } else {
             $error = $ldap->get_error();
           }
           msg_dialog::display(
-            _("Could not get macAddress for $member"),
+            sprintf(_('Could not get macAddress for "%s"'), $member),
             msgPool::ldaperror($error), ERROR_DIALOG
           );
         }
@@ -165,7 +160,7 @@ class opsiClient extends simplePlugin
   function remove_from_parent()
   {
     global $config;
-    if ($this->member_of_group) {
+    if ($this->member_of_group && !$this->is_template) {
       // If the winstation is member of an ogroup which has OPSI activated, we must update_or_insert information
       // We have to call this in here because save won't be called as is_account is FALSE
       $this->update_or_insert();
@@ -175,33 +170,30 @@ class opsiClient extends simplePlugin
       return;
     }
 
-    $macAddresses = array();
-    if ($this->editing_group()) {
-      $ldap = $config->get_ldap_link();
-      foreach ($this->initialMembers as $member) {
-        $ldap->cat($member, array('macAddress'), '(&(!(objectClass=opsiClient))(macAddress=*))');
-        if (!$ldap->success()) {
-          msg_dialog::display(
-            _("Could not get macAddress for $member"),
-            msgPool::ldaperror($ldap->get_error()), ERROR_DIALOG
-          );
-        } elseif ($attrs = $ldap->fetch()) {
-          $macAddresses[] = $attrs['macAddress'][0];
+    if (!$this->is_template) {
+      $macAddresses = array();
+      if ($this->editing_group()) {
+        $ldap = $config->get_ldap_link();
+        foreach ($this->initialMembers as $member) {
+          $ldap->cat($member, array('macAddress'), '(&(!(objectClass=opsiClient))(macAddress=*))');
+          if ($attrs = $ldap->fetch()) {
+            $macAddresses[] = $attrs['macAddress'][0];
+          }
         }
+      } elseif (!$this->member_of_group) {
+        $macAddresses = array($this->parent->getBaseObject()->macAddress);
       }
-    } elseif (!$this->member_of_group) {
-      $macAddresses = array($this->parent->getBaseObject()->macAddress);
-    }
 
-    if (!empty($macAddresses)) {
-      $s_daemon   = new supportDaemon();
-      if ($s_daemon->is_available()) {
-        $s_daemon->append_call('OPSI.delete', $macAddresses, array());
-        if ($s_daemon->is_error()) {
-          msg_dialog::display(
-            _('Could not remove OPSI information'),
-            msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
-          );
+      if (!empty($macAddresses)) {
+        $s_daemon   = new supportDaemon();
+        if ($s_daemon->is_available()) {
+          $s_daemon->append_call('OPSI.delete', $macAddresses, array());
+          if ($s_daemon->is_error()) {
+            msg_dialog::display(
+              _('Could not remove OPSI information'),
+              msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
+            );
+          }
         }
       }
     }
diff --git a/opsi/locale/ar/fusiondirectory.po b/opsi/locale/ar/fusiondirectory.po
index 7e9e60f149c4c6bdcb6334e410b9ebf6e23367d4..94472373489f4cd49d0c795d30702ab75bb7abbc 100644
--- a/opsi/locale/ar/fusiondirectory.po
+++ b/opsi/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/ca/fusiondirectory.po b/opsi/locale/ca/fusiondirectory.po
index 84dccb0f17647fe25ab2a6984ff826ea9f30c324..47a8d6f1ed448c1af48e02c7543ccdef47433c1f 100644
--- a/opsi/locale/ca/fusiondirectory.po
+++ b/opsi/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/cs_CZ/fusiondirectory.po b/opsi/locale/cs_CZ/fusiondirectory.po
index ae5c50dba2fe38b118f959ff8c3d79244fbcb475..113072b92d5774830f1692439ce3e5319e052e0d 100644
--- a/opsi/locale/cs_CZ/fusiondirectory.po
+++ b/opsi/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -163,6 +163,11 @@ msgstr "%s nelze v LDAP nalézt"
 msgid "Failed to contact OPSI server"
 msgstr "Nezdařilo se kontaktovat OPSI server"
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/de/fusiondirectory.po b/opsi/locale/de/fusiondirectory.po
index d151d9f54457d3abcacc9ff61ad23dd0ed0f548e..d6c7bbfd888ad8cc53441f645bd537c7dcf433ba 100644
--- a/opsi/locale/de/fusiondirectory.po
+++ b/opsi/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -161,6 +161,11 @@ msgstr "Konnte %s nicht im LDAP finden"
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/el_GR/fusiondirectory.po b/opsi/locale/el_GR/fusiondirectory.po
index 260ad4851b9bda982e1446ba50f623e598969d09..5a5a01931d5b743b90aa69813b379ff3b52ed338 100644
--- a/opsi/locale/el_GR/fusiondirectory.po
+++ b/opsi/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -160,6 +160,11 @@ msgstr "Δεν βρέθηκε ο %s στον LDAP"
 msgid "Failed to contact OPSI server"
 msgstr "Αποτυχία σύνδεσης στον διακομιστή OPSI"
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/en/fusiondirectory.po b/opsi/locale/en/fusiondirectory.po
index 4d3d4027bde280be4c11d4be74422ef8b646126a..00dd0bd718a13c5038267cef3ef88f51289b1652 100644
--- a/opsi/locale/en/fusiondirectory.po
+++ b/opsi/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -36,7 +36,7 @@ msgid "No mac address"
 msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:98
-#: admin/systems/opsi/class_opsiClient.inc:158
+#: admin/systems/opsi/class_opsiClient.inc:153
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -159,6 +159,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -230,15 +235,24 @@ msgstr ""
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:101
-msgid "Could not get macAddress for OPSI server !"
+#: admin/systems/opsi/class_opsiClient.inc:96
+msgid "Could not get macAddress for OPSI server!"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:110
-#: admin/systems/opsi/class_opsiClient.inc:202
+#: admin/systems/opsi/class_opsiClient.inc:105
+#: admin/systems/opsi/class_opsiClient.inc:193
 msgid "Could not remove OPSI information"
 msgstr ""
 
+#: admin/systems/opsi/class_opsiClient.inc:136
+msgid "This member was not found or has no macAddress"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:141
+#, php-format
+msgid "Could not get macAddress for \"%s\""
+msgstr ""
+
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
diff --git a/opsi/locale/es/fusiondirectory.po b/opsi/locale/es/fusiondirectory.po
index c12de26f65c5b6057f0b3428b3252bf433c7d000..649d11536f0924666a1e74e9b0b5528825faa27e 100644
--- a/opsi/locale/es/fusiondirectory.po
+++ b/opsi/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/es_CO/fusiondirectory.po b/opsi/locale/es_CO/fusiondirectory.po
index 426822a17e939ab699825b38311580b86885d4fb..e03c37aa1dfc1947d7a44496342717ec7f992a4c 100644
--- a/opsi/locale/es_CO/fusiondirectory.po
+++ b/opsi/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/es_VE/fusiondirectory.po b/opsi/locale/es_VE/fusiondirectory.po
index 010ec53221b48e9acb79e226b0c4e7654536ac9b..a05d3036b78b5c8be88b3985e75936a36d76ad61 100644
--- a/opsi/locale/es_VE/fusiondirectory.po
+++ b/opsi/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/fa_IR/fusiondirectory.po b/opsi/locale/fa_IR/fusiondirectory.po
index 4e2eef14af0afa81e69c4ba2fc0af7ac74b84b66..6d101a37357364e2c28916d4e81ab146ba99bd0a 100644
--- a/opsi/locale/fa_IR/fusiondirectory.po
+++ b/opsi/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -159,6 +159,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/fi_FI/fusiondirectory.po b/opsi/locale/fi_FI/fusiondirectory.po
index 01c9941e9a4f235f54b5037c7fb789387acb87ea..38b50c957807ae7ebea4d0631ce644abb0f1bd96 100644
--- a/opsi/locale/fi_FI/fusiondirectory.po
+++ b/opsi/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/fr/fusiondirectory.po b/opsi/locale/fr/fusiondirectory.po
index b2b7d1ee1dfe0441085c5c1770b0ea11c49f49e9..75d5b138d4d98174db93e7f24a48fe87fc9976ca 100644
--- a/opsi/locale/fr/fusiondirectory.po
+++ b/opsi/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -43,7 +43,7 @@ msgstr "Mise à jour des informations OPSI impossible"
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
-msgstr "Informations sur le serveur OPSI"
+msgstr "Configuration OPSI"
 
 #: config/opsi/class_opsiConfig.inc:29
 msgid "FusionDirectory OPSI plugin configuration"
@@ -56,7 +56,7 @@ msgstr "OPSI"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "OPSI RDN"
-msgstr "RDN OPSI"
+msgstr "Branche OPSI"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "Branch in which OPSI profiles will be stored"
@@ -160,6 +160,11 @@ msgstr "Impossible de trouver %s dans l'annuaire LDAP"
 msgid "Failed to contact OPSI server"
 msgstr "Impossible de contacter le serveur OPSI"
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr "%s (%s-%s)"
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/hu_HU/fusiondirectory.po b/opsi/locale/hu_HU/fusiondirectory.po
index 542855f5cc49a41b814c33ad3770671546792809..d7e13b008e0f777f90dde804ee21a30598176a24 100644
--- a/opsi/locale/hu_HU/fusiondirectory.po
+++ b/opsi/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/id/fusiondirectory.po b/opsi/locale/id/fusiondirectory.po
index 971c45c9ffdadf6f5070fb0134d1974efc055f38..ea0d0a547b15214bbc53fe6c8e94e9fb9ad810c1 100644
--- a/opsi/locale/id/fusiondirectory.po
+++ b/opsi/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -159,6 +159,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/it_IT/fusiondirectory.po b/opsi/locale/it_IT/fusiondirectory.po
index e815374e1356dfd8d20a6f439a6c6cbfe33cff14..dd39a1062c4d0dd5a2e5cbedc9644f3b5e95d268 100644
--- a/opsi/locale/it_IT/fusiondirectory.po
+++ b/opsi/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -160,6 +160,11 @@ msgstr "Impossibile trovare %s nell'annuario LDAP"
 msgid "Failed to contact OPSI server"
 msgstr "Campo per contattare il server OPSI"
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr "1%s ( 1%s - 1%s )"
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/lv/fusiondirectory.po b/opsi/locale/lv/fusiondirectory.po
index 23b02baac5d7a6cfc300b2673b4bed59f4a4950e..ff4f2fec7d3766b4f02b823a67bb199365fd76aa 100644
--- a/opsi/locale/lv/fusiondirectory.po
+++ b/opsi/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/nb/fusiondirectory.po b/opsi/locale/nb/fusiondirectory.po
index 9501705d8cf1b2aba6e9212f8b1a021ac519fe5c..9f5018879e628e32cfceadd8de0d6c97205d3c49 100644
--- a/opsi/locale/nb/fusiondirectory.po
+++ b/opsi/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/nl/fusiondirectory.po b/opsi/locale/nl/fusiondirectory.po
index 5c01f3f5f72c2c02d1d7c7e9ff50041df9273c96..b8817b360088c964f9f89dd984290b32cd368ae1 100644
--- a/opsi/locale/nl/fusiondirectory.po
+++ b/opsi/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -160,6 +160,11 @@ msgstr "Kan %s niet vinden in de LDAP"
 msgid "Failed to contact OPSI server"
 msgstr "Kan de OPSI server niet bereiken"
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/pl/fusiondirectory.po b/opsi/locale/pl/fusiondirectory.po
index cdda006bddf684d2acfef64617270379fe7632ac..9a1082c7f812a78491c809375cb39c648206cf05 100644
--- a/opsi/locale/pl/fusiondirectory.po
+++ b/opsi/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
 msgid "OPSI import"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/pt/fusiondirectory.po b/opsi/locale/pt/fusiondirectory.po
index d93be34e5f4b062d6ffc50d72632240286ad7049..ae85d5aca094ff4414c6628a7004ee5b108cf95d 100644
--- a/opsi/locale/pt/fusiondirectory.po
+++ b/opsi/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/pt_BR/fusiondirectory.po b/opsi/locale/pt_BR/fusiondirectory.po
index c38132c889b71c7e318ffa10543dcf9ec45dcc28..01f572a047990efd8d7e9393a0ae72a8d4c2ee6b 100644
--- a/opsi/locale/pt_BR/fusiondirectory.po
+++ b/opsi/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/ru/fusiondirectory.po b/opsi/locale/ru/fusiondirectory.po
index ead98842219903cb94deda2dbe17c437f37ee0ad..2b0ba067e8da6aba6964be37ff997681e7df9180 100644
--- a/opsi/locale/ru/fusiondirectory.po
+++ b/opsi/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/ru@petr1708/fusiondirectory.po b/opsi/locale/ru@petr1708/fusiondirectory.po
index c4cedf8fb60b0160bce6f203b4d4c6d5d563d7c6..18f32b910e0ecc053267397bdd31d34fb6b83f35 100644
--- a/opsi/locale/ru@petr1708/fusiondirectory.po
+++ b/opsi/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -159,6 +159,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/sv/fusiondirectory.po b/opsi/locale/sv/fusiondirectory.po
index 4c3ed925c9f7e3b6346d2bcda180b4e2f2fbfb73..4aa69640483f640b1460f88bbeff80528c152f9a 100644
--- a/opsi/locale/sv/fusiondirectory.po
+++ b/opsi/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/ug/fusiondirectory.po b/opsi/locale/ug/fusiondirectory.po
index b11138da97da451831fdbedec73615c2e42f48d7..01c1fe58d87d40354333a015aa1a6c3c43da8218 100644
--- a/opsi/locale/ug/fusiondirectory.po
+++ b/opsi/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -159,6 +159,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/vi_VN/fusiondirectory.po b/opsi/locale/vi_VN/fusiondirectory.po
index 9fa531079fef6500ac2000397de76691b1979e35..be0faae4c98be59594172fcada29ff9942510de4 100644
--- a/opsi/locale/vi_VN/fusiondirectory.po
+++ b/opsi/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/opsi/locale/zh/fusiondirectory.po b/opsi/locale/zh/fusiondirectory.po
index 73cfce68f1577f1c4f2c401c517e2d0bd5b474a3..f68f83a408d4d2c61acd83f14e802f7f931a946e 100644
--- a/opsi/locale/zh/fusiondirectory.po
+++ b/opsi/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Failed to contact OPSI server"
 msgstr ""
 
+#: admin/opsi/class_opsiSoftwareList.inc:149
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
diff --git a/personal/locale/ar/fusiondirectory.po b/personal/locale/ar/fusiondirectory.po
index 225e9d23bf62a7622272f4e106db827c1b55d1b3..55b8f3b88a5f030fcb6fc9c23cc7132cf603634d 100644
--- a/personal/locale/ar/fusiondirectory.po
+++ b/personal/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/personal/locale/ca/fusiondirectory.po b/personal/locale/ca/fusiondirectory.po
index fc0013823917577a4992e7c691702051f0c6c66c..dd080d35ce98d2bda5824e9e16c842160324a5ee 100644
--- a/personal/locale/ca/fusiondirectory.po
+++ b/personal/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/personal/locale/cs_CZ/fusiondirectory.po b/personal/locale/cs_CZ/fusiondirectory.po
index 04b4ec6596ec567d1c0241a8897125137be7a78b..44d051b7a3c8330de6f28b766f5594290e11db04 100644
--- a/personal/locale/cs_CZ/fusiondirectory.po
+++ b/personal/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2017\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/personal/locale/de/fusiondirectory.po b/personal/locale/de/fusiondirectory.po
index 85ad64e7f4a99ef36eef2a08a4efcda163582d32..5b001041ccad99f4521441a8db956cbb34f6a534 100644
--- a/personal/locale/de/fusiondirectory.po
+++ b/personal/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/personal/locale/el_GR/fusiondirectory.po b/personal/locale/el_GR/fusiondirectory.po
index 4480c01a219ac14a4aa6f1f0f6eaa7a6846752e1..fee511a2ef12dc3f02170d3b392d2c093257024a 100644
--- a/personal/locale/el_GR/fusiondirectory.po
+++ b/personal/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/personal/locale/en/fusiondirectory.po b/personal/locale/en/fusiondirectory.po
index 621e7dd77479be9f43f063577259b7ebf8597a3b..9f3480df2a9aa465e056c779fcefe7597b49194d 100644
--- a/personal/locale/en/fusiondirectory.po
+++ b/personal/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/personal/locale/es/fusiondirectory.po b/personal/locale/es/fusiondirectory.po
index 43d957a90e7966c1fdc10a4272500e7a9ee0f060..c655eb798638d51abcbf41397f7ceb696b32678a 100644
--- a/personal/locale/es/fusiondirectory.po
+++ b/personal/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/personal/locale/es_CO/fusiondirectory.po b/personal/locale/es_CO/fusiondirectory.po
index f67328cf4b80035f47fea4b462b2657213d2196e..0442dcf54aa87564365d5fc0b3119ab85c890fc2 100644
--- a/personal/locale/es_CO/fusiondirectory.po
+++ b/personal/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/personal/locale/es_VE/fusiondirectory.po b/personal/locale/es_VE/fusiondirectory.po
index 2ff18eacb026935d737f41db0a36e7abf73665a9..9175fb22ec3f36e8cbc1433f28cc092dbdf9c345 100644
--- a/personal/locale/es_VE/fusiondirectory.po
+++ b/personal/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/personal/locale/fa_IR/fusiondirectory.po b/personal/locale/fa_IR/fusiondirectory.po
index 9f1463f25d234d4fc7b20d01047038185f5c8907..3cbaf890ae5647caaf8aac17b492e5f25540b1a9 100644
--- a/personal/locale/fa_IR/fusiondirectory.po
+++ b/personal/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/personal/locale/fi_FI/fusiondirectory.po b/personal/locale/fi_FI/fusiondirectory.po
index 5b07f1b4761a02113aee4caf6c1df3ab5c04ce7d..17f7e916f73e8c90d432c30349ebc9bac2f294aa 100644
--- a/personal/locale/fi_FI/fusiondirectory.po
+++ b/personal/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/personal/locale/fr/fusiondirectory.po b/personal/locale/fr/fusiondirectory.po
index 9de1478e811efcfbc0ffedf6afc86c2bee79c832..2a46bbbed59c7681c10181e36ce3600d8f518854 100644
--- a/personal/locale/fr/fusiondirectory.po
+++ b/personal/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/personal/locale/hu_HU/fusiondirectory.po b/personal/locale/hu_HU/fusiondirectory.po
index ea8132f0521d6368f7b0861bbddf3697e6c698f1..22ee3d862d059bb663ce3ff625aab03ce532b5ac 100644
--- a/personal/locale/hu_HU/fusiondirectory.po
+++ b/personal/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/id/fusiondirectory.po b/personal/locale/id/fusiondirectory.po
index ffd312fb4a7c4be4fe41f9cf98a3293bcb90a885..ceaed5bc00aa3bd42c4491fd3ef1cfa0c7b450fe 100644
--- a/personal/locale/id/fusiondirectory.po
+++ b/personal/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/it_IT/fusiondirectory.po b/personal/locale/it_IT/fusiondirectory.po
index b1e6ca33ab29e5e0ed0219f18ff4732226628d64..bbc38d61ef9193b92fba33b2bb2fd2e1e8def092 100644
--- a/personal/locale/it_IT/fusiondirectory.po
+++ b/personal/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/personal/locale/lv/fusiondirectory.po b/personal/locale/lv/fusiondirectory.po
index 626cfb1df7d05c8d550789cf63a40fbca19c4ef1..77c805117ec2c554dcf41ceaec65747a5e994e75 100644
--- a/personal/locale/lv/fusiondirectory.po
+++ b/personal/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/personal/locale/nb/fusiondirectory.po b/personal/locale/nb/fusiondirectory.po
index 39250419558528d233e41a0f7ff67e1e083d0501..074e3981abe717c7430fc253cd59de4d36411308 100644
--- a/personal/locale/nb/fusiondirectory.po
+++ b/personal/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/nl/fusiondirectory.po b/personal/locale/nl/fusiondirectory.po
index 496293defbed381a0fb6fc49a556beaed0b1b799..a06615e7d4d1950a315c57ff7e15449c40939452 100644
--- a/personal/locale/nl/fusiondirectory.po
+++ b/personal/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/personal/locale/pl/fusiondirectory.po b/personal/locale/pl/fusiondirectory.po
index 4ed646b0289eb4b70f9648001b0ad4fa7cf7bfde..86e701f6e7f5f6dca31671009d9acd5ef679b63e 100644
--- a/personal/locale/pl/fusiondirectory.po
+++ b/personal/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/personal/class_personalInfo.inc:30
 msgid "Site"
diff --git a/personal/locale/pt/fusiondirectory.po b/personal/locale/pt/fusiondirectory.po
index 35ff2d2d6fb5c03c05d0b7bb098981aa00ac6338..90d2e76e0d89064846f24c84b6505567b948447c 100644
--- a/personal/locale/pt/fusiondirectory.po
+++ b/personal/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/personal/locale/pt_BR/fusiondirectory.po b/personal/locale/pt_BR/fusiondirectory.po
index ca48b8e329bd909d5cd8be0085816dffcb692b63..6dadc7529dfd5b9d254fe02f5979db92e9ce4f36 100644
--- a/personal/locale/pt_BR/fusiondirectory.po
+++ b/personal/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/personal/locale/ru/fusiondirectory.po b/personal/locale/ru/fusiondirectory.po
index b329f40daecb14a4a34806fe7507c421c8bda256..f369ea3d46e04b3329192976e6f9565561bf8d92 100644
--- a/personal/locale/ru/fusiondirectory.po
+++ b/personal/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/personal/locale/ru@petr1708/fusiondirectory.po b/personal/locale/ru@petr1708/fusiondirectory.po
index f56375f9b784410ec1f0ef819509bff9241afe66..d528ae6cf54229d4c3bf9bcdd4a616b6f74e25ea 100644
--- a/personal/locale/ru@petr1708/fusiondirectory.po
+++ b/personal/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/sv/fusiondirectory.po b/personal/locale/sv/fusiondirectory.po
index d0414bd02539ba233578c557254aaa3c0e74f7dc..6368e4e6e0b92cce629afde79330218df1aebc0b 100644
--- a/personal/locale/sv/fusiondirectory.po
+++ b/personal/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/personal/locale/ug/fusiondirectory.po b/personal/locale/ug/fusiondirectory.po
index 9e5c2585fef7316c9d89725d3e8756af96c7d269..2bb60117878de7c4d2e451332768796e4d003937 100644
--- a/personal/locale/ug/fusiondirectory.po
+++ b/personal/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/vi_VN/fusiondirectory.po b/personal/locale/vi_VN/fusiondirectory.po
index f69f520e596e02fe439952294d94ffa52ab61e12..a6b6f73f1c066247cabdb91d5913d53f19133133 100644
--- a/personal/locale/vi_VN/fusiondirectory.po
+++ b/personal/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/personal/locale/zh/fusiondirectory.po b/personal/locale/zh/fusiondirectory.po
index 19c50c2b39711198256512e75cc509b59026000d..f96d2f046a49a77b9b35c4c1a5568239e6ee47fd 100644
--- a/personal/locale/zh/fusiondirectory.po
+++ b/personal/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/posix/config/posix/class_posixConfig.inc b/posix/config/posix/class_posixConfig.inc
index 9282a321a34b6e2672cc8591a35ff0949fd08273..965b6834a715cb7ddc915d12e97e79a8c0bb334b 100644
--- a/posix/config/posix/class_posixConfig.inc
+++ b/posix/config/posix/class_posixConfig.inc
@@ -42,6 +42,11 @@ class posixConfig extends simplePlugin
         'name'  => _('Posix'),
         'class' => array('critical'),
         'attrs' => array(
+          new StringAttribute (
+            _('POSIX groups RDN'), _('The branch where POSIX groups are stored.'),
+            'fdGroupRDN', TRUE,
+            'ou=groups'
+          ),
           new IntAttribute (
             _('Group/user min id'),
             _('The minimum assignable user or group id to avoid security leaks with id 0 accounts.'),
diff --git a/posix/locale/ar/fusiondirectory.po b/posix/locale/ar/fusiondirectory.po
index 47c2dd1c0453ab045f3b6d426cb84a4558f94df8..12fc678a19365a1da5de1985616acaba9db16694 100644
--- a/posix/locale/ar/fusiondirectory.po
+++ b/posix/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "تلقائي"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "تحذير"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "خطأ"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/ca/fusiondirectory.po b/posix/locale/ca/fusiondirectory.po
index a660ba494984462876b4c7376c84d2ded46221c7..ce291ee420a796370e93e7646057ebdc8976df79 100644
--- a/posix/locale/ca/fusiondirectory.po
+++ b/posix/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Directori personal"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Intèrpret d'ordres"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Compte"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Avís"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Error"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/cs_CZ/fusiondirectory.po b/posix/locale/cs_CZ/fusiondirectory.po
index c381899108383563c89803bb3f7f2d10804bf034..f2128b5bbb6ad28645f0190c1b777ab5462ff9dd 100644
--- a/posix/locale/cs_CZ/fusiondirectory.po
+++ b/posix/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -18,91 +18,91 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "upravit POSIXová nastavení uživatele"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "domovský adresář"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "Umístění domovské složky tohoto uživatele"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr "Který shell by měl být použit, když se uživatel přihlásí"
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "nenastavené"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "hlavní skupina"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr "Hlavní skupina tohoto uživatele"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "stav"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr "Stav tohoto unixového uživatelského účtu"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr "Vynutit konkrétní identifikátor uživatele/skupiny"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 "Pro tohoto uživatele vynutit konkrétní identifikátory uživatele a jeho "
 "hlavní skupiny"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr "Identifikátor uživatele"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr "Hodnota identifikátoru účtu tohoto uživatele"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr "Idenifikátor skupiny"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr "Hodnota identifikátoru hlavní skupiny tohoto uživatele"
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "členství ve skupinách"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "účet"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "Uživatel musí při prvním přihlášení změnit heslo."
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
@@ -110,21 +110,21 @@ msgstr ""
 "Při prvním přihlášení musí uživatel změnit heslo (vyžaduje nastavenou "
 "hodnotu u Prodleva před vynucením změny hesla)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr "Prodleva před vynucením změny hesla (dny)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
@@ -132,22 +132,22 @@ msgstr ""
 "Po tomto počtu dnů bude uživatel přiměn ke změně hesla (nevyplnění funkce "
 "vypíná)"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr "Datum skončení platnosti hesla"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 "Datum po kterém skončí platnost hesla uživatele (nevyplnění tuto funkci "
 "vypíná)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr "Délka nečinnosti uživatele, po které bude účet uživatele vypnut (dny)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
@@ -156,11 +156,11 @@ msgstr ""
 "než dojde k jeho vypnutí (zůstane ovšem zachován). Nevyplnění tuto funkci "
 "vypíná"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr "Prodleva varování uživatele před skončením platnosti hesla (dny)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
@@ -168,145 +168,145 @@ msgstr ""
 "Uživatel bude varován nastavený počet dnů předem před skončením platnosti "
 "hesla (nevyplnění tuto funkci vypíná)"
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "systém důvěryhodnosti"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "režim důvěryhodnosti"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr "Typ ověřování pro tyto stroje"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "zakázáno"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "plný přístup"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "povolit přístup k těmto strojům"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Tomuto uživateli povolit připojení pouze na počítače z tohoto seznamu"
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automatické"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "platnost skončila"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "běží čas odkladu"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "aktivní"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "platnost hesla skončila"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "heslo nelze změnit"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr "Skupina uživatele %s"
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "varování"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "chyba"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "Není k dispozici volné ID:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "chyba LDAPu"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "Identifikátor sambaUnixIdPool není jedinečný!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "Není k dispozici ID!"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "překročen maximální počet neúspěšných pokusů!"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "Není k dispozici volné ID – není co přidělit!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -323,10 +323,18 @@ msgid "Posix"
 msgstr "POSIX"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr "Nejnižší identifikátor skupiny/uživatele"
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
@@ -334,11 +342,11 @@ msgstr ""
 "Nejnižší umožněný přiřaditelný identifikátor uživatele či skupiny pro "
 "vyloučení bezpečnostních průniků s účty s identifikátorem 0 (root)."
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr "Háček příštího identifikátoru"
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
@@ -346,95 +354,95 @@ msgstr ""
 "Skript, který má být volán pro nalezení dalšího volného identifikátoru pro "
 "uživatele nebo skupiny."
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr "Od jakého čísla začít přidělovat identifikátory uživatelů"
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr "Kde začít s hledáním volných identifikátorů pro nové uživatele."
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr "Od jakého čísla začít přidělovat identifikátory skupin"
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr "Kde začít s hledáním volných identifikátorů pro nové skupiny."
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr "Metoda přiřazování identifikátorů"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr "Způsob přiřazování identifikátorů uživatelů/skupin"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Tradiční"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr "Rozsah unixových identifikátorů pro Samba"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr "Nejnižší identifikátor uživatele"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 "Nejnižší umožněná hodnota pro identifikátor uživatele při použití způsobu "
 "rozsahu"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr "Nejvyšší identifikátor uživatele"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 "Nejvyšší umožněná hodnota pro identifikátor uživatele při použití způsobu "
 "rozsahu"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr "Nejnižší identifikátor skupiny"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 "Nejnižší umožněná hodnota pro identifikátor skupiny při použití způsobu "
 "rozsahu"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr "Nejvyšší identifikátor skupiny"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 "Nejvyšší umožněná hodnota pro identifikátor skupiny při použití způsobu "
 "rozsahu"
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr "Dostupné shelly"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr "POSIX shelly, dostupné pro uživatele F.D."
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/de/fusiondirectory.po b/posix/locale/de/fusiondirectory.po
index f4218cbb2cb51163fa2d1a0f2bfa74eb08f87a4e..ca75e5ad90f4fb306c4c746c656402898807accd 100644
--- a/posix/locale/de/fusiondirectory.po
+++ b/posix/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -18,91 +18,91 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Benutzer POSIX-Einstellungen bearbeiten"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "Der Pfad zum Heimatverzeichnis für diesen Benutzer"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 "Welche Shell soll verwendet werden, wenn dieser Benutzer sich einloggt"
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Primäre Gruppe"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr "Primäre Gruppe für diesen Benutzer"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Status"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr "Status dieses Benutzer unixkontos"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr "Benutzer-/Gruppenkennung erzwingen"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 "Benutzerkennungs- und Gruppenkennungswerte für diesen Benutzer erzwingen"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr "Benutzerkennung"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr "Benutzerkennwert für diesen Benutzer"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr "Gruppenkennung"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr "Gruppenkennwert für diesen Benutzer"
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Gruppenmitgliedschaft"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Konto"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "Benutzer muss beim ersten Anmelden sein Passwort ändern"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
@@ -110,11 +110,11 @@ msgstr ""
 "Benutzer muss das Passwort bei der ersten Anmeldung ändern (benötigt einen "
 "Wert für die Verzögerung, bevor die Passwortänderung erzwungen wird)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr "Mindestverzögerung zwischen Passwortänderungen (Tage)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
@@ -122,11 +122,11 @@ msgstr ""
 "Der Benutzer kann sein Passwort nicht vor dieser Anzahl an Tagen ändern (zum"
 " Deaktivieren leer lassen)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr "Verzögerung bevor die Passwortänderung forciert wird (Tage)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
@@ -134,23 +134,23 @@ msgstr ""
 "Der Benutzer wird gezwungen werden, sein Passwort nach dieser Anzahl von "
 "Tagen zu ändern (Leer lassen zum Deaktivieren)"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr "Passwort Ablaufdatum"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 "Datum nach dem dieses Benutzerpasswort ablaufen wird (leer lassen zur "
 "Deaktivierung)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 "Verzögerung von Inaktivität bevor der Benutzer deaktiviert wird (Tage)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
@@ -158,11 +158,11 @@ msgstr ""
 "Maximale Verzögerung der Inaktivität nach Passwortablauf bevor der Benutzer "
 "deaktiviert wird (leer lassen zum Deaktivieren)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr "Verzögerung für Benutzerwarnung vor Passwortablauf (Tage)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
@@ -170,145 +170,145 @@ msgstr ""
 "Der Benutzer wird diese Anzahl an Tagen vorher gewarnt, bevor sein Passwort "
 "aufläuft (leer lassen zum Deaktivieren)"
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "System-Vertrauen"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Vertrauens-Modus"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr "Art der Authorisierung für diese Hosts"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Nur diesem Benutzer erlauben, dieser Liste von Hosts zu verbinden"
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automatisch"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "abgelaufen"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "Nachfrist aktiv"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "aktiv"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "Passwort abgelaufen"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "Passwort kann nicht geändert werden"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr "Gruppe des Benutzers %s"
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Warnung"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Fehler"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "Konnte keine freie ID allozieren:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool ist nicht eindeutig!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "keine ID verfügbar!"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "maximale Anzahl von Versuchen abgelaufen!"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "Konnte keine freie ID allozieren!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -325,108 +325,116 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr "Nachster id hook"
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr "Basisnummer für Benutzerkennung"
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 "Wo mit der Suche nach einer neuen freien user id gestartet werden soll."
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr "Basisnummer für Gruppenkennung"
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 "Wo nach der Suche nach einer neuen freien group-ID geschaut werden soll."
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr "Id-Zuweisungsmethode"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr "Samba unix id pool"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr "Verfügbare Shells"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr "Verfügbare POSIX-Shells für FD-Benutzer."
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/el_GR/fusiondirectory.po b/posix/locale/el_GR/fusiondirectory.po
index 017329f091b6309ef7ce4d38f599c189ebce2b09..bcf67169f92d09360221459fa04d59075997c496 100644
--- a/posix/locale/el_GR/fusiondirectory.po
+++ b/posix/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -18,92 +18,92 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Επεξεργασία ρυθμίσεων χρηστών POSIX"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Προσωπικός κατάλογος"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "Η διαδρομή για τον αρχικό κατάλογο του χρήστη"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Κέλυφος"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr "Ποιο κέλυφος πρέπει να χρησιμοποιηθεί όταν ο χρήστης συνδεθεί"
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "μη ρυθμισμένο"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Κύρια ομάδα"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr "Κύρια ομάδα του χρήστη"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr "Κατάσταση του λογαριασμού unix του χρήστη"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr "Εξαναγκασμός user/group id"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 "Υποχρέωση συμπλήρωσης τιμών για user id και group id για αυτόν τον χρήστη"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr "User id"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr "Τιμή User id για αυτόν τον χρήστη."
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr "Group id"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr "Τιμή Group id για αυτόν τον χρήστη"
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Μέλη ομάδας"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 "Ο χρήστης θα πρέπει να αλλάξει τον κωδικό πρόσβασης κατά την πρώτη του "
 "σύνδεση"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
@@ -112,21 +112,21 @@ msgstr ""
 " Καθυστέρηση δηλώνει το πόσες φορές μπορεί ο χρήστης να συνδεθεί πριν "
 "αναγκαστεί να αλλάξει συνθηματικό)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr "Καθυστέρηση πριν την υποχρεωτική αλλαγή κωδικού πρόσβασης (σε ημέρες)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
@@ -134,22 +134,22 @@ msgstr ""
 "Ο χρήστης θα υποχρεωθεί να αλλάξει τον κωδικό πρόσβασής του μετά από αυτό "
 "τον αριθμό ημερών (αφήστε κενό για απενεργοποίηση)"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr "Ημερομηνία λήξης κωδικού πρόσβασης"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 "Ημερομηνία μετά από την οποία θα λήγει ο κωδικός πρόσβασης (αφήστε κενό για "
 "απενεργοποίηση)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr "Ημέρες αδράνειας πριν από την απενεργοποίηση του χρήστη"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
@@ -157,11 +157,11 @@ msgstr ""
 "Μέγιστος αριθμός ημερών αδράνειας μετά την λήξη του κωδικού πρόσβασης πριν "
 "την απενεργοποίηση του χρήστη (αφήστε κενό για απενεργοποίηση)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr "Ημέρες μεταξύ προειδοποίησης χρήστη και λήξης κωδικού:"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
@@ -169,146 +169,146 @@ msgstr ""
 "Ο χρήστης θα προειδοποιείται αυτόν τον αριθμό των ημερών πριν από τη λήξη "
 "του κωδικού πρόσβασής του (αφήστε κενό για απενεργοποίηση)"
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Εμπιστοσύνη συστήματος"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Λειτουργία επιστοσύνης"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr "Τύπος εξουσιοδότησή για αυτά τα συστήματα"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "απενεργοποιημένο"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "Πλήρης Πρόσβαση"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "να επιτραπεί πρόσβαση σε αυτά τα host"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 "Επιτρέπεται σ'αυτόν τον χρήστη να συνδέεται στην ακόλουθη λίστα διακομιστών"
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "αυτόματο"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr " έληξε"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "χρονικό διάστημα χάριτος ενεργό"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "ενεργό"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "ο κωδικός πρόσβασης έχει λήξει"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "ο κωδικός πρόσβασης δεν μπορεί να αλλάξει"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr "Ομάδα του χρήστη %s"
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "Δεν είναι δυνατό να ανατεθεί μια free ID:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool  δεν είναι μοναδική!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "Μη διαθέσιμη ID!"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "Υπέρβαση μεγίστου ορίου προσπαθειών!"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "Δεν είναι δυνατή η διάθεση μιας  free ID!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -325,20 +325,28 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
@@ -346,87 +354,87 @@ msgstr ""
 "Ένα σενάριο που θα κληθεί για την εύρεση του επόμενου ελεύθερου id για "
 "χρήστες ή ομάδες."
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr "Αριθμός βάση για user id"
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr "Τοποθεσία εύρεσης νέου ελεύθερου user id."
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr "Αριθμός βάση για group id"
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr "Τοποθεσία εύρεσης νέου ελεύθερου group id."
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr "Μέθοδος διανομής id"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr "Μέθοδος για την διανομή user/group id"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Παραδοσιακή"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/en/fusiondirectory.po b/posix/locale/en/fusiondirectory.po
index 686d7dfc223b90a705dbdc8ddc4fde9a6b6f5aaf..e2e495fca03d8d513038c3c5510c75bd62d81c98 100644
--- a/posix/locale/en/fusiondirectory.po
+++ b/posix/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,283 +17,283 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:298
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:317
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:319
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:322
-#: personal/posix/class_posixAccount.inc:324
-#: personal/posix/class_posixAccount.inc:326
+#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:426
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:534
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:778
-#: personal/posix/class_posixAccount.inc:799
-#: personal/posix/class_posixAccount.inc:993
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:778
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:800
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:827
-#: personal/posix/class_posixAccount.inc:867
-#: personal/posix/class_posixAccount.inc:879
-#: personal/posix/class_posixAccount.inc:883
-#: personal/posix/class_posixAccount.inc:890
-#: personal/posix/class_posixAccount.inc:899
-#: personal/posix/class_posixAccount.inc:961
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:827
-#: personal/posix/class_posixAccount.inc:867
-#: personal/posix/class_posixAccount.inc:879
-#: personal/posix/class_posixAccount.inc:883
-#: personal/posix/class_posixAccount.inc:890
-#: personal/posix/class_posixAccount.inc:899
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:827
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:859
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:867
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:879
-#: personal/posix/class_posixAccount.inc:883
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:899
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:961
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:993
-msgid "'nextIdHook' is not available. Using default base!"
+#: personal/posix/class_posixAccount.inc:998
+msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:28
@@ -309,106 +309,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/es/fusiondirectory.po b/posix/locale/es/fusiondirectory.po
index d31e0d93eab68b597e2b1fde59fdbd94ec0edabc..5d4b69571d304bba496587884997ef2a469883a1 100644
--- a/posix/locale/es/fusiondirectory.po
+++ b/posix/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -18,283 +18,283 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Editar parametros de usuarios POSIX"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "Sin configurar"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Grupo primario"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Estado"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Pertenencia a grupo"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Cuenta"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 "El usuario debe introducir la contraseña en el primer inicio de sesión"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "desactivado"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automático"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "expiró"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "Periodo de gracia activado"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "activo"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "la contraseña expiró"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "no puede cambiar la contraseña"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Error"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "No se puede asignar un identificador (ID) libre:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "¡%sPoolMin >= %sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "¡sambaUnixIdPool no es único!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "¡No hay ID disponibles!"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "¡Excedido el número de intentos máximo!"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "¡No se puede asignar un identificador (ID) libre!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -311,106 +311,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/es_CO/fusiondirectory.po b/posix/locale/es_CO/fusiondirectory.po
index 58a125b79d89602e30a08a05c5e7773bf842d6f9..d7a43b3631522183bba3e90c41d4d87bf932f04c 100644
--- a/posix/locale/es_CO/fusiondirectory.po
+++ b/posix/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -18,89 +18,89 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Editar configuración POSIX de los usuarios"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "'Home' del usuario"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "La ruta al nuevo directorio 'home' del usuario."
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr "Qué 'shells' deberían usarse cuando este usuario inicie sesión."
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "Aún sin configurar"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Grupo Primario"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr "Grupo primario para este usuario"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Estado"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr "Estado de la cuenta Unix de este usuario"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr "Forzar 'id' de usuario/grupo "
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr "Forzar los valores 'id' y 'group id' para éste usuario."
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr "id de usuario"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr "Forzar valor 'id' para este usuario"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr "id de Grupo"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr "Forzar valor 'Group id' para este usuario."
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Pertenencia a grupos"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Cuenta de usuario"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "El usuario debe cambiar su contraseña en el primer inicio de sesión."
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
@@ -108,21 +108,21 @@ msgstr ""
 "El usuario debe cambiar su contraseña en el primer inicio de sesión "
 "(necesita un valor de retraso antes de forzar el cambio de contraseña)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr "Retraso antes de forzar el cambio de contraseña (días)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
@@ -130,22 +130,22 @@ msgstr ""
 "El usuario será forzado a cambiar su contraseña después de este número de "
 "días (deje vacío para deshabilitar)"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr "Fecha de caducidad para la contraseña"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 "La fecha tras la cual la contraseña de este usuario va a caducar (deje vacío"
 " para deshabilitar)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr "Retraso de inactividad antes de deshabilitar el usuario (días)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
@@ -153,12 +153,12 @@ msgstr ""
 "Luego de que caduque la contraseña del usuario, tiempo máximo de retraso "
 "antes de deshabilitar la cuenta del usuario (deje vacío para deshabilitar)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 "Retraso para avisar al usuario sobre el vencimiento de su contraseña (días)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
@@ -166,145 +166,145 @@ msgstr ""
 "El usuario será advertido esta cantidad de días antes de que su contraseña "
 "caduque (deje vacío para deshabilitar)"
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Confianza del Sistema"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Modo de Confianza"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr "Tipo de autorización para ésos equipos"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "Acceso Completo"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "Permitir acceso a ésos equipos"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Permitir a este usuario conectarse a esta lista de hosts."
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automático"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "expirado"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "Período de gracia activo"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "activo"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "Contraseña expirada"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "Contraseña no modificable"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr "Grupo del usuario %s"
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Precacuión"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Error"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "!sambaUnixIdPool no es un valor único!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -321,10 +321,18 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr "Grupo/usuario min id"
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
@@ -332,11 +340,11 @@ msgstr ""
 "El número 'id' mínimo asignable a un usuario o grupo para evitar fallas de "
 "seguridad como cuentas de usuario con id '0'."
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr "Siguiente id hook"
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
@@ -344,89 +352,89 @@ msgstr ""
 "Un script que buscará el siguiente número \"id\" libre para usuarios o "
 "grupos."
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr "Número base para 'id' de usuario"
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr "Dónde buscar un id libre de usuario."
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr "Número base para 'id' de grupo"
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr "Dónde buscar un id libre de grupo"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr "Método para asignar 'ids'"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr "Método para asignar 'ids' de grupo/usuario"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr "Samba unix id pool"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr "Pool user id min"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 "Valor mínimo para el valor 'id' del usuario cuando utilice el método 'pool'"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr "Pool user id max"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 "Valor máximo para el valor 'id' del usuario cuando utilice el método 'pool'"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr "Pool group id min"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr "Valor mínimo para id de 'grupo' cuando se utilice el método 'pool'"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr "Pool group id max"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr "Valor máximo para el group id cuando se utilice el método pool."
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr "Shells disponibles"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr "Shells POSIX disponibles para usuarios de FD."
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/es_VE/fusiondirectory.po b/posix/locale/es_VE/fusiondirectory.po
index 212b3559a6e7181302c0d051e38e6b42a5ae1f88..e6be3ae36f7b3a4ac4d8643b78992f288627ba2f 100644
--- a/posix/locale/es_VE/fusiondirectory.po
+++ b/posix/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -18,283 +18,283 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Editar parametros de usuarios POSIX"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "Sin configurar"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Grupo primario"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Estado"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Pertenencia a grupo"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Cuenta"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 "El usuario debe introducir la contraseña en el primer inicio de sesión"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "desactivado"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automático"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "expiró"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "Periodo de gracia activado"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "activo"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "la contraseña expiró"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "no puede cambiar la contraseña"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Error"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "No se puede asignar un identificador (ID) libre:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "¡%sPoolMin >= %sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "¡sambaUnixIdPool no es único!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "¡No hay ID disponibles!"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "¡Excedido el número de intentos máximo!"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "¡No se puede asignar un identificador (ID) libre!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -311,106 +311,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/fa_IR/fusiondirectory.po b/posix/locale/fa_IR/fusiondirectory.po
index b5e9feaacf63ef02a59a1f1264c399e9b8f52e67..fcf0729362e7ad54f68eef63e8db99335c9746f6 100644
--- a/posix/locale/fa_IR/fusiondirectory.po
+++ b/posix/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "خطا"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/fi_FI/fusiondirectory.po b/posix/locale/fi_FI/fusiondirectory.po
index cb30aeb8fe6b66d0343e872beeca690af1c88d8a..0e7325615a976163d7311d634e77911cdf26f9a3 100644
--- a/posix/locale/fi_FI/fusiondirectory.po
+++ b/posix/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Varoitus"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Virhe"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/fr/fusiondirectory.po b/posix/locale/fr/fusiondirectory.po
index 2cb83b9b5e2ffb1e9a77783e4e42793ef316c979..c071b11036be22e258358c7ec9a3ab5c04a14123 100644
--- a/posix/locale/fr/fusiondirectory.po
+++ b/posix/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,138 +18,138 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
-msgstr "Editer les paramètres Unix"
+msgstr "Éditer les paramètres POSIX"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
-msgstr "Répertoire Home"
+msgstr "Répertoire personnel"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "Chemin du répertoire \"home\" de cet utilisateur"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr "Shell à utiliser lors de la connexion de l’utilisateur"
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "non configuré"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Groupe principal"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr "Groupe principal de cet utilisateur"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Statut"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
-msgstr "Status du compte unix de l'utilisateur"
+msgstr "Statut du compte unix de l'utilisateur"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr "Forcer l’id d’utilisateur/groupe"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
-"Force les valeurs des ids d’utilisateur et de groupe pour cet utilisateur."
+"Forcer les valeurs des ids d’utilisateur et de groupe pour cet utilisateur"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr "Id d’utilisateur"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr "Id d’utilisateur à utiliser pour cet utilisateur"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr "Id de groupe"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr "Id de groupe à utiliser pour cet utilisateur"
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
-msgstr "Appartenance au groupe"
+msgstr "Appartenance aux groupes"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Compte"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 "L'utilisateur doit changer son mot de passe lors de sa première connexion"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
-"L'utilisateur doit changer son mot de passe lors du premier connexion "
-"(laisser vide pour désactiver la fonctionnalité)"
+"L'utilisateur doit changer son mot de passe lors de sa première connexion "
+"(nécessite une valeur dans «Délai avant de forcer le changement»)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr "Délai minimum entre les changements de mot de passe (jours)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
-"L'utilisateur ne sera pas habilité à changer son mot de passe avant ce "
-"nombre de jour (laisser vide pour désactiver)"
+"L'utilisateur ne sera pas autorisé à changer son mot de passe avant ce "
+"nombre de jours (laisser vide pour désactiver)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr "Délai avant de forcer le changement de mot de passe (en jours)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
-"L'utilisateur sera forcé de changer son mot de passe après ce nombre de jour"
-" (laisser vide pour désactiver)"
+"L'utilisateur sera forcé de changer son mot de passe après ce nombre de "
+"jours (laisser vide pour désactiver)"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr "Date d'expiration du mot de passe"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
-"Date après laquelle le mot de passe de l'utilisateur va expiré (laisser vide"
-" pour désactiver)"
+"Date après laquelle le mot de passe de l'utilisateur va expirer (laisser "
+"vide pour désactiver)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr "Délai d'inactivité avant de désactiver l'utilisateur (en jours)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
@@ -157,166 +157,164 @@ msgstr ""
 "Délai maximum d'inactivité après l'expiration du mot de passe avant que "
 "l'utilisateur soit désactivé (laisser vide pour désactiver)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-"Délai avant d'avertir l'utilisateur de l'expiration de son mot de passe (en "
-"jours)"
+msgstr "Délai pour avertir de l'expiration de son mot de passe (en jours)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
-"L'utilisateur sera averti de ce nombre de jour restant avant l'expiration de"
-" ce mot de passe (laisser vide pour désactiver)"
+"L'utilisateur sera averti à partir de ce nombre de jours restant avant "
+"l'expiration de son mot de passe (laisser vide pour désactiver)"
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
-msgstr "Système de Confiance"
+msgstr "Systèmes autorisés"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Mode de confiance"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr "Type d'autorisation pour ces hôtes"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "désactivé"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "accès complet"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
-msgstr "Autoriser seulement cet utilisateur à se connecter sur cet hôte"
+msgstr "Autoriser cet utilisateur à se connecter uniquement sur ces hôtes"
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automatique"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
-msgstr "expire"
+msgstr "expiré"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
-msgstr "temps de grâce activé"
+msgstr "temps de grâce actif"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "actif"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "mot de passe expiré"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "mot de passe non modifiable"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr "Groupe de l'utilisateur %s"
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Avertissement"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
-msgstr "Méthode d'allocation inconnue pour \"%s\" !"
+msgstr "Méthode d'allocation inconnue pour «%s» !"
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr "Le temps d'attente du verrou a été dépassé. Verrou ignoré pour %s !"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Erreur"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
-msgstr "Impossible d'assigner un ID libre :"
+msgstr "Impossible d'allouer un ID libre :"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >= %sPoolMax !"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool n'est pas unique !"
+msgstr "sambaUnixIdPool n'est pas unique !"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
-msgstr "Pas d' ID disponibles !"
+msgstr "Pas d’ID disponible !"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
-msgstr "Nombre maximum d'essais dépassés !"
+msgstr "Nombre maximum d'essais dépassés !"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
-msgstr "Impossible d'assigner un ID libre !"
+msgstr "Impossible d'allouer un ID libre !"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
-"'nextIdHook' n'est pas disponible. Utilisation de la base par défaut !"
+"«nextIdHook» n’est pas disponible. Utilisation de la base par défaut !"
 
 #: config/posix/class_posixConfig.inc:28
 msgid "POSIX configuration"
-msgstr "Configuration Posix"
+msgstr "Configuration POSIX"
 
 #: config/posix/class_posixConfig.inc:29
 msgid "FusionDirectory POSIX plugin configuration"
@@ -327,121 +325,128 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr "Branche des groupes POSIX"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr "Branche où sont stockés les groupes POSIX."
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr "Id minimum de groupe/utilisateur"
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
-"L’id d’utilisateur ou de groupe minimum assignable pour éviter des risques "
-"de sécurité avec des id égales à 0."
+"L’id d’utilisateur ou de groupe minimum pour éviter des risques de sécurité "
+"avec des id égales à 0."
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
-msgstr ""
-"Déclencheur permettant de déterminer le prochain identifiant numérique"
+msgstr "Hook de prochain ID"
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
-"Un script à appeler pour trouver le prochain id libre pour les utilisateurs "
+"Un script à appeler pour trouver le prochain ID libre pour les utilisateurs "
 "et groupes."
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr "Départ pour les ids d’utilisateur"
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
-msgstr "Où commencer à chercher pour un nouvel id d’utilisateur libre."
+msgstr "Point de départ pour chercher pour un nouvel id d’utilisateur libre."
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr "Départ pour les ids de groupe"
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
-msgstr "Point de départ pour rechercher un identifiant de groupe libre"
+msgstr "Point de départ pour chercher un nouvel id de groupe libre"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
-msgstr "Méthode de répartition des Id"
+msgstr "Méthode d’allocation des ids"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr "Méthode pour allouer les ids d’utilisateur et de groupe"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Traditionnel"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr "Samba unix id pool"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr "Minimum des ids d’utilisateur du réservoir"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr "Valeur minimum pour les ids d’utilisateur du réservoir"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr "Maximum des ids d’utilisateur du réservoir"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr "Valeur maximum pour les ids d’utilisateur du réservoir"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr "Minimum des ids de groupe du réservoir"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr "Valeur minimum pour les ids de groupe du réservoir"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr "Maximum des ids de groupe du réservoir"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr "Valeur maximum pour les ids de groupe du réservoir"
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr "Shells"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr "Shells disponibles"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr "Shells POSIX disponibles pour les utilisateurs de FusionDirectory"
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr "Shell par défaut"
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr "Shell utilisé par défaut lors de l'activation du tab Unix."
 
 #: admin/groups/posix/class_posixGroup.inc:34
 msgid "Group"
-msgstr "Groupes"
+msgstr "Groupe"
 
 #: admin/groups/posix/class_posixGroup.inc:35
 msgid "POSIX group information"
-msgstr "Information du groupe POSIX"
+msgstr "Informations du groupe POSIX"
 
 #: admin/groups/posix/class_posixGroup.inc:38
 msgid "POSIX group"
@@ -486,8 +491,8 @@ msgstr "GID de ce groupe"
 #: admin/groups/posix/class_posixGroup.inc:81
 #: admin/groups/posix/class_posixGroup.inc:84
 msgid "Group members"
-msgstr "Membre du groupe"
+msgstr "Membres du groupe"
 
 #: admin/groups/posix/class_posixGroup.inc:102
 msgid "Only allow this group to connect to this list of hosts"
-msgstr "Autoriser seulement ce groupe à se connecter sur ces listes d'hôtes"
+msgstr "Autoriser ce groupe à se connecter uniquement sur cette liste d'hôtes"
diff --git a/posix/locale/hu_HU/fusiondirectory.po b/posix/locale/hu_HU/fusiondirectory.po
index 03c2739c4993fe1ff8cb8222232dbf7241d94402..13df6fb5355de7b5ff9c77d45552657f17774d83 100644
--- a/posix/locale/hu_HU/fusiondirectory.po
+++ b/posix/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/id/fusiondirectory.po b/posix/locale/id/fusiondirectory.po
index 682b95d26d90ea189cf3e74a6a412aa3bca3d454..c1d75695190a499746e8d5f2526cd0cb362c2749 100644
--- a/posix/locale/id/fusiondirectory.po
+++ b/posix/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,282 +17,282 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -309,106 +309,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/it_IT/fusiondirectory.po b/posix/locale/it_IT/fusiondirectory.po
index f179dac997e4485d0d340947f352d5f61f10a3aa..f785e9c8da6cbf33893878a9f55a37fb0b50bde6 100644
--- a/posix/locale/it_IT/fusiondirectory.po
+++ b/posix/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -18,89 +18,89 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Modifica le impostazioni POSIX dell'utente"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Home directory"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "Il path verso la cartella personale di questo utente"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr "Quale shell dovrà essere usata quando l'utente sarà connesso"
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "non configurato"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Gruppo primario"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr "Gruppo primario per questo utente"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Stato"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr "Stato di questo account utente unix"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr "Forza l'id utente/gruppo"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr "Forza valori ID utente e ID gruppo per questo utente"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr "Utente"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr "Valore utente per questo utente"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr "numero del Gruppo"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr "Valore del numero del gruppo per questo utente"
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Gruppi di appartenenza"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Account"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "L'utente dovrà cambiare la password alla prima connessione"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
@@ -108,11 +108,11 @@ msgstr ""
 "L'utente deve cambiare password al primo login (serve un valore di ritardo "
 "prima di forzare il cambio password)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr "Lasso di tempo minimo tra le modifiche delle password (giorni)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
@@ -120,11 +120,11 @@ msgstr ""
 "L'utente non sarà in grado di cambiare la propria password prima di questo "
 "numero di giorni (lasciare vuoto per disabilitare)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr "Richiamo prima dell'obbligo di modifica della password (giorni)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
@@ -132,24 +132,24 @@ msgstr ""
 "L'utente sarà obbligato di cambiare la sua password dopo questo numero di "
 "giorni (lasciare vuoto per disabilitare)"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr "Data di scadenza della password"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 "Data dopo la quale questa password utente scadrà (lasciare vuoto per "
 "disabilitare)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 "Periodo di inattività prima della disattivazione dell'account utente "
 "(giorni)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
@@ -157,11 +157,11 @@ msgstr ""
 "Ritardo massimo di inattività dopo la scadenza della password prima che "
 "l'utente venga disabilitato (lasciare vuoto per disabilitare)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr "Richiamo per l'utente prima che la password scada (giorni)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
@@ -169,145 +169,145 @@ msgstr ""
 "L'utente sarà avvertito questo numero di giorni prima della scadenza della "
 "sua password (lasciare vuoto per disabilitare)"
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Sistema di fiducia"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Modalità di fiducia"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr "Tipo di autorizzazione per questi host"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "disattivato"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "accesso completo"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "autorizza l'accesso a questi host"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host"
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automatico"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "Scaduto"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "Il tempo di grazia è attivo"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "Attivo"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "Password scaduta"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "Password non modificabile"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr "Gruppo di utenti %s"
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr "Metodo di assegnazione ID \"%s\" sconosciuto!"
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr "Timeout durante l'attesa per il blocco. Ignorare blocco da %s!"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Errore"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "Impossibile assegnare un ID libero:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool non è univoco !"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "nessun ID disponibile !"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "Il numero massimo di tentativi è stato superato"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "Impossibile assegnare un ID libero!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr "\"NextIdHook\" non è disponibile. Utilizzo della base di default!"
 
@@ -324,10 +324,18 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr "Gruppi POSIX RDN"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr "Il ramo dove vengono memorizzati i gruppi POSIX."
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr "Gruppo/utente minimo ID"
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
@@ -335,11 +343,11 @@ msgstr ""
 "Il minimo utente o grupp ID assegnabile per evitare perdite di sicurezza con"
 " iaccount ID 0."
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr "Id hook successivo"
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
@@ -347,87 +355,87 @@ msgstr ""
 "Script da nominare per trovare il prossimo numero ID libero per gli utenti o"
 " i gruppi."
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr "Numero base per questo ID utente"
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr "Dove cominciare a cercare un nuovo id libero per un utente."
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr "Numero base per questo id gruppo"
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr "Dove cominciare a cercare un nuovo id libero per un gruppo ."
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr "Metodo di assegnazione Id"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr "Metodo per allocare utente / gruppo id"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Tradizionale"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr "Id del pool di Samba unix"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr "Minimo pool id dell'utente"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr "Valore minimo di un id utente quando si utilizza il metodo pool"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr "Id utente pool max"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr "Valore massimo di un id utente quando si utilizza il metodo pool"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr "Id utente pool min"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr "Valore minimo di un id gruppo quando si utilizza il metodo pool"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr "Id gruppo pool min"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr "Valore massimo di un id gruppo quando si utilizza il metodo pool"
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr "Shell"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr "Shell disponibili"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr "Shell POSIX disponibili per gli utenti FD"
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr "Shell di default"
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 "Shell utilizzato per impostazione predefinita durante l'attivazione scheda "
diff --git a/posix/locale/lv/fusiondirectory.po b/posix/locale/lv/fusiondirectory.po
index 6d9f05d9e0a2c448145a5cbe824cb2dac25fa6df..76b9857129c707fb57f72d2b6c268f100d349cad 100644
--- a/posix/locale/lv/fusiondirectory.po
+++ b/posix/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Kļūda"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/nb/fusiondirectory.po b/posix/locale/nb/fusiondirectory.po
index 9510fc50b4c248df489bc89be2ccb604ee55bb62..7e192961867656826745cb46a5cbfce6554bab69 100644
--- a/posix/locale/nb/fusiondirectory.po
+++ b/posix/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Feil"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/nl/fusiondirectory.po b/posix/locale/nl/fusiondirectory.po
index 4404b66a838f77b94f73184d5ab9ab93f913c843..d5d42f4d18c9abcf65209bd89f01093dc62056e9 100644
--- a/posix/locale/nl/fusiondirectory.po
+++ b/posix/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Wijzig gebruikers POSIX opties"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Persoonlijke map"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "niet geconfigureerd"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Primaire groep"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Status"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Groep lidmaatschap"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Account"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "Het wachtwoord moet bij de eerste aanmelding gewijzigd worden"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Systeem vertrouwen"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Vertrouwensmodus"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "volledige toegang"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automatisch"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "verlopen"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "gratie tijd actief"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "actief"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "paswoord is vervallen"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "paswoord niet wijzigbaar"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Fout"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "Kan geen vrij ID  toekennen:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >=%sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool is niet uniek!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "Geen ID beschikbaar!"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "maximum pogingen overschreden!"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "Kan geen vrij ID toekennen!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/pl/fusiondirectory.po b/posix/locale/pl/fusiondirectory.po
index e761708cc76738fc527121fe296b6f0fdeedaa83..af3188482d7c416681b1cce92289493d6aec26ba 100644
--- a/posix/locale/pl/fusiondirectory.po
+++ b/posix/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,284 +16,284 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Katalog domowy"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "nieskonfigurowane"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Grupa podstawowa"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Status"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Przynależność do grup"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Konto"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "Użytkownik musi zmienić hasło przy pierwszym logowaniu"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Zaufanie systemowe"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Tryb zaufania"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "wyłączone"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "pełen dostęp"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "zezwól na dostęp do tych hostów"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automatyczne"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "wygasło"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "Czas prolongaty aktywny"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "Aktywne"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "hasło wygasło"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "hasło niezmienialne"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Błąd"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/pt/fusiondirectory.po b/posix/locale/pt/fusiondirectory.po
index 6cf04dbb7652244fcccbbb986578517c31e7e0cc..025aaef32ccb2e0e7726f10419b523a32fce7564 100644
--- a/posix/locale/pt/fusiondirectory.po
+++ b/posix/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Diretório pessoal"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "desconfigurado"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Grupo primário"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Estatus"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Membros do grupo"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Conta"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "O usuário deve alterar sua senha no primeiro acesso"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Sistema de confiança"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Modo de confiança"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "desabilitado"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "acesso completo"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "permitir acesso a estas máquinas"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automático"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "expirado"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "ativo"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Atenção"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Erro"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/pt_BR/fusiondirectory.po b/posix/locale/pt_BR/fusiondirectory.po
index 3e039070e5a23682315ec7e48471026934af8869..746fee830da2c4e7adb582fcf3d8dd4f605519bb 100644
--- a/posix/locale/pt_BR/fusiondirectory.po
+++ b/posix/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Diretório principal"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "O pacote para o diretório principal deste usuário"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Estado"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Conta"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Sistema de confiança"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Modo de confiança"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "desabilitado"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "Acesso total"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "Permitir acesso a esses servidores"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Permitir apenas que este usuário conecte-se à lista de hosts"
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automático"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "senha expirada"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Erro"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr "Método de alocação de id"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr "Pool de id samba unix"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/ru/fusiondirectory.po b/posix/locale/ru/fusiondirectory.po
index 65533bb91d7c3540225ce92b428487e80637e788..cb27e7cf6f60bad9b78e2e87152ef8e6ef7b10c7 100644
--- a/posix/locale/ru/fusiondirectory.po
+++ b/posix/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -18,92 +18,92 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Редактировать POSIX настройки пользователя"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "Путь к домашнему каталогу пользователя"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Оболочка"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 "Какой шелл должен использоваться, когда пользователь заходит в систему"
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "Не настроено"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Основная группа"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr "Основная группа пользователя"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Состояние"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr "Статус учетной записи unix у пользователя"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr "Принудительный id пользователя/группы"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 "Навязанное значение идентификатора пользователя и группы для этого "
 "пользователя"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr "Id пользователя"
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr "Значение идентификатора пользователя"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr "Id группы"
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr "Значение идентификатора группы"
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Членство в группах"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Учетная запись"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "Пользователь должен сменить пароль при первом входе в систему"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
@@ -111,21 +111,21 @@ msgstr ""
 "Пользователь должен будет изменить пароль при первом входе (нужно указать "
 "значение для \"Задержка до принудительного изменения пароля\")"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr "Минимальная задержка между изменениями пароля (дни)"
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr "Задержка до принудительного изменения пароля (дни)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
@@ -133,22 +133,22 @@ msgstr ""
 "У пользователя насильно будет изменен пароль после указанного количества "
 "дней (оставить пустым, чтобы отключить)"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr "Дата окончания действия пароля"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 "Дата после которой пароль пользователя истечет (оставить пустым что бы "
 "отключить)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr "Через сколько отключать пользователя (дни)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
@@ -156,11 +156,11 @@ msgstr ""
 "Сколько подождать до отключения пользователя, после истечения пароля "
 "(оставить пустым, чтобы отключить)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr "За сколько предупреждать об окончании действия пароля (дни)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
@@ -168,145 +168,145 @@ msgstr ""
 "Предупреждать пользователя об окончании действия его пароля за указанное "
 "количество дней (оставить пустым, чтобы отключить)"
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Системные доверия"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Режим доверия"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr "Тип авторизации для этих хостов"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "отключен"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "полный доступ"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Пользователю разрешено подключаться только к хостам из списка"
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "автоматически"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "Истек"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "активный"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "срок действия параля истек"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "Пароль не изменяем"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr "Группа пользователя %s"
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Ошибка"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "Не могу выделить свободный ID:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool не уникальна!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "нет доступных ID!"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "Превышено максимальное число попыток!"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "Не могу выделить свободный ID!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -323,10 +323,18 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr "Минимальный id групп/пользователей"
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
@@ -335,11 +343,11 @@ msgstr ""
 "назначен, чтобы избежать дыры в безопасности с идентификатором учетной "
 "записи равным 0."
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
@@ -347,90 +355,90 @@ msgstr ""
 "Скрипт, который будет вызваться при нахождении следующего свободного номера "
 "id для пользователей иил групп."
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr "Начальное значение для id пользователя"
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 "Откуда начинать смотреть значение для нового свободного id пользователя."
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr "Начальное значение для id группы"
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr "Откуда начинать смотреть значение для нового свободного id группы."
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr "Метод выделения id"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr "Метод выделения идентификаторов для пользователей и групп"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Традиционный"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr "Пул id для samba и unix"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr "Минимальное значение id пользователей в пуле"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 "Минимальное значение для id пользователя, при использовании пул метода"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr "Максимальное значение id пользователя в пуле"
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 "Максимальное значение для id пользователя, при использовании пул метода"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr "Минимальное значение id группы в пуле"
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr "Минимальное значение для id группы, при использовании пул метода"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr "Максимальное значение id группы в пуле"
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr "Максимальное значение для id группы, при использовании пул метода"
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr "Доступные оболочки"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr "Доступные POSIX шеллы для пользователей FD"
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/ru@petr1708/fusiondirectory.po b/posix/locale/ru@petr1708/fusiondirectory.po
index cd8c4b0689814ecaa4fd740d11f27c965afc45f9..e80242496de443a1147f3f71a0b061066f37ca86 100644
--- a/posix/locale/ru@petr1708/fusiondirectory.po
+++ b/posix/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -17,282 +17,282 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -309,106 +309,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/sv/fusiondirectory.po b/posix/locale/sv/fusiondirectory.po
index 29e365d665c3b57e6a596e0a3cffaf24f58a2b4c..e7a3943f6069a11d6e6854fd12c9bab16e9a66d4 100644
--- a/posix/locale/sv/fusiondirectory.po
+++ b/posix/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -18,109 +18,109 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr "Unix"
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Redigera användarens POSIX-inställningar"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Hemkatalog"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr "Sökvägen till hemkatalogen för den här användaren"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Skal"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr "Vilket skal ska användas när den här användaren loggar in"
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "okonfigurerad"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Primär grupp"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr "Primär grupp för den här användaren"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Status"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr "Status på det här unix-kontot"
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Gruppmedlemskap"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Konto"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "Användare måste ändra lösenord vid första inloggning"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr "Fördröjning innan tvingande lösenordsbyte (dagar)"
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
@@ -128,22 +128,22 @@ msgstr ""
 "Användaren kommer att tvingas byta lösenord efter så här många dagar (lämna "
 "tomt för att  avaktivera)"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr "Utgångsdatum för lösenord"
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 "Datum efter vilket denna användares lösenord kommer att sluta gälla (lämna "
 "tomt för att avaktivera)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr "Inaktivitet innan avaktivering av användare (dagar)"
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
@@ -151,11 +151,11 @@ msgstr ""
 "Maximalt antal inaktiva dagar efter lösenordets utgång innan användaren är "
 "avaktiverad (lämna tomt för att avaktivera funktionen)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr "Fördröjning för varning innan lösenordsbyte (dagar)"
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
@@ -163,145 +163,145 @@ msgstr ""
 "Användaren kommer att varnas så här många dagar innan lösenordet löper ut "
 "(lämna tomt för att avaktivera)"
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "System trust"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Trust-läge"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr "Auktoriseringstyp för dessa hosts"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "avaktiverad"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "full tillgång"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "tillåt dessa hosts tillgång"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Tillåt användaren att endast logga in på denna lista av hosts"
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "automatisk"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "har utgått"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "grace-tid aktiv"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "aktiv"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "lösenord har slutat gälla"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr "lösenord kan inte ändras"
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Varning"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Fel"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr "Kan inte allokera ett fritt ID:"
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool är inte unik!"
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr "inget ID tillgängligt!"
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr "maximalt antal försök överskridet!"
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "Kan inte allokera ett fritt ID!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -318,106 +318,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr "Nästa id-hook"
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr "Var man ska börja kolla efter nya fria användar-IDn."
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr "Var man ska börja kolla efter nya fria grupp-IDn."
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr "Id-allokeringsmetod"
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr "Samba unix id pool"
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr "Tillgängliga skal"
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr "Tillgängliga POSIX-skal för FD-användare"
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/ug/fusiondirectory.po b/posix/locale/ug/fusiondirectory.po
index 8d6aa5b90fed208d595c04a2af70b36d3a857480..472ac971842e93cb01730518bbe07ba21600276c 100644
--- a/posix/locale/ug/fusiondirectory.po
+++ b/posix/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -17,282 +17,282 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -309,106 +309,114 @@ msgid "Posix"
 msgstr ""
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/vi_VN/fusiondirectory.po b/posix/locale/vi_VN/fusiondirectory.po
index 09724e93ed06117045db66160030cf19e65f66bf..dd498bfa088c5d2b2545ae5963499366e530c20b 100644
--- a/posix/locale/vi_VN/fusiondirectory.po
+++ b/posix/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr "Hiệu chỉnh cài đặt POSIX của người dùng"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "Thư mục chủ"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "không được cấu hình"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "Nhóm sơ cấp"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "Trạng thái"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "Tư cách thành viên nhóm"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "Tài khoản"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "Người dùng phải thay đổi mật khẩu ngay lần đăng nhập đầu tiên"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "Ủy thác hệ thống"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "Chế độ ủy thác"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "Đã vô hiệu"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "Truy cập hoàn toàn"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "Cho phép truy cập đến các máy chủ này"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "tự động"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "hết hạn"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "Thời gian trước khi tài khoản bị khóa đang hoạt động"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "hoạt động"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr "mật khẩu hết hạn"
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "Số ID của người sử dụng"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "Số ID của nhóm"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "Lá»—i"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr "Không thể phân phối một ID miễn phí!"
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/locale/zh/fusiondirectory.po b/posix/locale/zh/fusiondirectory.po
index 78c2288d47b06daf5691e1367b479e42852b7382..683dd2c7de45d97c411af4d3b55483ae0de2dfdd 100644
--- a/posix/locale/zh/fusiondirectory.po
+++ b/posix/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -18,282 +18,282 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/posix/class_posixAccount.inc:86
-#: personal/posix/class_posixAccount.inc:115
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
 msgid "Unix"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:87
+#: personal/posix/class_posixAccount.inc:89
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "Home directory"
 msgstr "用户主目录"
 
-#: personal/posix/class_posixAccount.inc:119
+#: personal/posix/class_posixAccount.inc:121
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Shell"
 msgstr "Shell"
 
-#: personal/posix/class_posixAccount.inc:124
+#: personal/posix/class_posixAccount.inc:126
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:126
+#: personal/posix/class_posixAccount.inc:128
 msgid "unconfigured"
 msgstr "未配置"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group"
 msgstr "主要用户组"
 
-#: personal/posix/class_posixAccount.inc:130
+#: personal/posix/class_posixAccount.inc:132
 msgid "Primary group for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status"
 msgstr "状态"
 
-#: personal/posix/class_posixAccount.inc:134
+#: personal/posix/class_posixAccount.inc:136
 msgid "Status of this user unix account"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user/group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:138
+#: personal/posix/class_posixAccount.inc:140
 msgid "Force user id and group id values for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:142
+#: personal/posix/class_posixAccount.inc:144
 msgid "User id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:147
+#: personal/posix/class_posixAccount.inc:149
 msgid "Group id value for this user"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:154
-#: personal/posix/class_posixAccount.inc:157
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
 msgid "Group membership"
 msgstr "组成员身份"
 
-#: personal/posix/class_posixAccount.inc:161
+#: personal/posix/class_posixAccount.inc:163
 msgid "Account"
 msgstr "账户"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid "User must change password on first login"
 msgstr "用户必须在第一次登录修改口令"
 
-#: personal/posix/class_posixAccount.inc:165
+#: personal/posix/class_posixAccount.inc:167
 msgid ""
 "User must change password on first login (needs a value for Delay before "
 "forcing password change)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid "Minimum delay between password changes (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:169
+#: personal/posix/class_posixAccount.inc:171
 msgid ""
 "The user won't be able to change his password before this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:174
+#: personal/posix/class_posixAccount.inc:176
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid "Password expiration date"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:179
+#: personal/posix/class_posixAccount.inc:181
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:184
+#: personal/posix/class_posixAccount.inc:186
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:189
+#: personal/posix/class_posixAccount.inc:191
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:201
+#: personal/posix/class_posixAccount.inc:203
 #: admin/groups/posix/class_posixGroup.inc:91
 msgid "System trust"
 msgstr "信赖的系统"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Trust mode"
 msgstr "信赖模式"
 
-#: personal/posix/class_posixAccount.inc:205
+#: personal/posix/class_posixAccount.inc:207
 #: admin/groups/posix/class_posixGroup.inc:95
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "disabled"
 msgstr "禁用"
 
-#: personal/posix/class_posixAccount.inc:209
-#: personal/posix/class_posixAccount.inc:231
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "full access"
 msgstr "完全访问权限"
 
-#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:211
 #: admin/groups/posix/class_posixGroup.inc:99
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
-#: personal/posix/class_posixAccount.inc:212
+#: personal/posix/class_posixAccount.inc:214
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:290
+#: personal/posix/class_posixAccount.inc:292
 msgid "automatic"
 msgstr "自动"
 
-#: personal/posix/class_posixAccount.inc:351
+#: personal/posix/class_posixAccount.inc:353
 msgid "expired"
 msgstr "过期"
 
-#: personal/posix/class_posixAccount.inc:353
+#: personal/posix/class_posixAccount.inc:355
 msgid "grace time active"
 msgstr "时间限制激活"
 
-#: personal/posix/class_posixAccount.inc:356
 #: personal/posix/class_posixAccount.inc:358
 #: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
 msgid "active"
 msgstr "活动"
 
-#: personal/posix/class_posixAccount.inc:356
+#: personal/posix/class_posixAccount.inc:358
 msgid "password expired"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
 msgid "password not changeable"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:420
+#: personal/posix/class_posixAccount.inc:422
 msgid "UID"
 msgstr "UID"
 
-#: personal/posix/class_posixAccount.inc:423
+#: personal/posix/class_posixAccount.inc:425
 #: admin/groups/posix/class_posixGroup.inc:74
 #: admin/groups/posix/class_posixGroup.inc:150
 msgid "GID"
 msgstr "GID"
 
-#: personal/posix/class_posixAccount.inc:531
+#: personal/posix/class_posixAccount.inc:537
 #, php-format
 msgid "Group of user %s"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:753
-#: personal/posix/class_posixAccount.inc:774
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
 msgid "Warning"
 msgstr "警告"
 
-#: personal/posix/class_posixAccount.inc:753
+#: personal/posix/class_posixAccount.inc:783
 #, php-format
 msgid "Unknown ID allocation method \"%s\"!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:775
+#: personal/posix/class_posixAccount.inc:805
 #, php-format
 msgid "Timeout while waiting for lock. Ignoring lock from %s!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
 msgid "Error"
 msgstr "错误"
 
-#: personal/posix/class_posixAccount.inc:802
-#: personal/posix/class_posixAccount.inc:842
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
-#: personal/posix/class_posixAccount.inc:865
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:802
+#: personal/posix/class_posixAccount.inc:832
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:834
+#: personal/posix/class_posixAccount.inc:864
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
-#: personal/posix/class_posixAccount.inc:842
+#: personal/posix/class_posixAccount.inc:872
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:854
-#: personal/posix/class_posixAccount.inc:858
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
 msgid "no ID available!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:874
+#: personal/posix/class_posixAccount.inc:904
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:936
+#: personal/posix/class_posixAccount.inc:966
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: personal/posix/class_posixAccount.inc:968
+#: personal/posix/class_posixAccount.inc:998
 msgid "\"nextIdHook\" is not available. Using default base!"
 msgstr ""
 
@@ -310,106 +310,114 @@ msgid "Posix"
 msgstr "Posix"
 
 #: config/posix/class_posixConfig.inc:46
+msgid "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
 msgid "Group/user min id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:47
+#: config/posix/class_posixConfig.inc:52
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with id 0 "
 "accounts."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid "Next id hook"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:52
+#: config/posix/class_posixConfig.inc:57
 msgid ""
 "A script to be called for finding the next free id number for users or "
 "groups."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:56
+#: config/posix/class_posixConfig.inc:61
 msgid "Base number for user id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:57
+#: config/posix/class_posixConfig.inc:62
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:62
+#: config/posix/class_posixConfig.inc:67
 msgid "Base number for group id"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:63
+#: config/posix/class_posixConfig.inc:68
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Id allocation method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:68
+#: config/posix/class_posixConfig.inc:73
 msgid "Method to allocate user/group ids"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Traditional"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:71
+#: config/posix/class_posixConfig.inc:76
 msgid "Samba unix id pool"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Pool user id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:74
+#: config/posix/class_posixConfig.inc:79
 msgid "Minimum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Pool user id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:79
+#: config/posix/class_posixConfig.inc:84
 msgid "Maximum value for user id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Pool group id min"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:84
+#: config/posix/class_posixConfig.inc:89
 msgid "Minimum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Pool group id max"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:89
+#: config/posix/class_posixConfig.inc:94
 msgid "Maximum value for group id when using pool method"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:96
+#: config/posix/class_posixConfig.inc:101
 msgid "Shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available shells"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:100
+#: config/posix/class_posixConfig.inc:105
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Default shell"
 msgstr ""
 
-#: config/posix/class_posixConfig.inc:107
+#: config/posix/class_posixConfig.inc:112
 msgid "Shell used by default when activating Unix tab."
 msgstr ""
 
diff --git a/posix/personal/posix/class_posixAccount.inc b/posix/personal/posix/class_posixAccount.inc
index 1dd2a9aba1694bf181a7e509e27650ce88a8b9c1..ac515aa6d8f5ee71987ecf1c46e59b0bcb4cb2bd 100644
--- a/posix/personal/posix/class_posixAccount.inc
+++ b/posix/personal/posix/class_posixAccount.inc
@@ -35,7 +35,7 @@ class EpochDaysDateAttribute extends DateAttribute
   /* 24 * 60 * 60 = 86400 */
   public static $secondsPerDay = 86400;
 
-  function __construct ($label, $description, $ldapName, $required, $defaultValue = 'now', $acl = "")
+  function __construct ($label, $description, $ldapName, $required, $defaultValue = 'now', $acl = '')
   {
     parent::__construct($label, $description, $ldapName, $required, '', $defaultValue, $acl);
   }
@@ -80,6 +80,8 @@ class posixAccount extends simplePlugin
   var $objectclasses = array('posixAccount', 'shadowAccount');
   protected $locks = array();
 
+  protected $fromTemplate = FALSE;
+
   static function plInfo()
   {
     return array(
@@ -272,14 +274,6 @@ class posixAccount extends simplePlugin
     );
 
     if ($dn !== NULL) {
-      /* Correct is_account. shadowAccount is not required. */
-      if (isset($this->attrs['objectClass']) &&
-          in_array ('posixAccount', $this->attrs['objectClass'])) {
-        $this->is_account = TRUE;
-      }
-
-      $this->initially_was_account = $this->is_account;
-
       /* Fill group */
       $this->primaryGroup = $this->gidNumber;
     }
@@ -295,39 +289,16 @@ class posixAccount extends simplePlugin
     $this->attributesAccess['loginShell']->setChoices($loginShellList);
 
     $secondaryGroups = array();
-    $secondaryGroups[''] = "- "._("automatic")." -";
+    $secondaryGroups[''] = '- '._('automatic').' -';
     $ldap = $config->get_ldap_link();
     $ldap->cd($config->current['BASE']);
-    $ldap->search("(objectClass=posixGroup)", array("cn", "gidNumber"));
+    $ldap->search('(objectClass=posixGroup)', array('cn', 'gidNumber'));
     while ($attrs = $ldap->fetch()) {
       $secondaryGroups[$attrs['gidNumber'][0]] = $attrs['cn'][0];
     }
-    asort ($secondaryGroups);
+    asort($secondaryGroups);
     $this->attributesAccess['primaryGroup']->setChoices(array_keys($secondaryGroups), array_values($secondaryGroups));
 
-    if (!$this->is_template) {
-      $current = floor(date("U") / EpochDaysDateAttribute::$secondsPerDay);
-
-      $shadowExpire     = $this->attributesAccess['shadowExpire']->getEpochDays();
-      $shadowInactive   = $this->attributesAccess['shadowInactive']->getValue();
-      $shadowMin        = $this->attributesAccess['shadowMin']->getValue();
-      $shadowMax        = $this->attributesAccess['shadowMax']->getValue();
-      $shadowLastChange = $this->attributesAccess['shadowLastChange']->getValue();
-      if (($current >= $shadowExpire) && ($shadowExpire > 0)) {
-        $status = _("expired");
-        if ($shadowInactive != "" && ($current - $shadowExpire) < $shadowInactive) {
-          $status .= ", "._("grace time active");
-        }
-      } elseif ($shadowMax != "" && ($shadowLastChange + $shadowMax) <= $current) {
-        $status = _("active").", "._("password expired");
-      } elseif ($shadowMin != "" && ($shadowLastChange + $shadowMin) <= $current) {
-        $status = _("active").", "._("password not changeable");
-      } else {
-        $status = _("active");
-      }
-      $this->attributesAccess['posixStatus']->setValue($status);
-    }
-
     $this->attributesAccess['groupMembership']->setInLdap(FALSE);
     if (class_available('mixedGroup')) {
       $this->attributesAccess['groupMembership']->setDisabled(TRUE);
@@ -344,10 +315,9 @@ class posixAccount extends simplePlugin
         $ldap->search('(&(objectClass=posixGroup)(memberUid='.ldap_escape_f($this->getUid()).'))', array('cn', 'description'));
         $groupMembership = array();
         while ($attrs = $ldap->fetch()) {
-          if (!isset($attrs['description'][0])) {
-            $entry = $attrs['cn'][0];
-          } else {
-            $entry = $attrs['cn'][0].' ['.$attrs['description'][0].']';
+          $entry = $attrs['cn'][0];
+          if (isset($attrs['description'][0])) {
+            $entry .= ' ['.$attrs['description'][0].']';
           }
           $groupMembership[$attrs['dn']] = $entry;
         }
@@ -359,6 +329,7 @@ class posixAccount extends simplePlugin
       }
     }
     if ($this->is_template) {
+      /* Template specific handling */
       if (isset($this->attrs['force_ids'])) {
         $this->force_ids = ($this->attrs['force_ids'][0] != 'FALSE');
       }
@@ -369,9 +340,37 @@ class posixAccount extends simplePlugin
       if (isset($this->attrs['mustchangepassword'])) {
         $this->mustchangepassword = ($this->attrs['mustchangepassword'][0] != 'FALSE');
       }
+    } else {
+      /* Status is not computed for templates */
+      $current = floor(date('U') / EpochDaysDateAttribute::$secondsPerDay);
+
+      $shadowExpire     = $this->attributesAccess['shadowExpire']->getEpochDays();
+      $shadowInactive   = $this->attributesAccess['shadowInactive']->getValue();
+      $shadowMin        = $this->attributesAccess['shadowMin']->getValue();
+      $shadowMax        = $this->attributesAccess['shadowMax']->getValue();
+      $shadowLastChange = $this->attributesAccess['shadowLastChange']->getValue();
+      if (($current >= $shadowExpire) && ($shadowExpire > 0)) {
+        $status = _('expired');
+        if ($shadowInactive != '' && ($current - $shadowExpire) < $shadowInactive) {
+          $status .= ', '._('grace time active');
+        }
+      } elseif ($shadowMax != '' && ($shadowLastChange + $shadowMax) <= $current) {
+        $status = _('active').', '._('password expired');
+      } elseif ($shadowMin != '' && ($shadowLastChange + $shadowMin) <= $current) {
+        $status = _('active').', '._('password not changeable');
+      } else {
+        $status = _('active');
+      }
+      $this->attributesAccess['posixStatus']->setValue($status);
     }
   }
 
+  function is_this_account($attrs)
+  {
+    /* shadowAccount is not required */
+    return (isset($attrs['objectClass']) && in_array_ics('posixAccount', $attrs['objectClass']));
+  }
+
   function getUid()
   {
     if (isset($this->parent)) {
@@ -419,33 +418,33 @@ class posixAccount extends simplePlugin
 
     /* Check ID's if they are forced by user */
     if ($this->force_ids) {
-      if ($this->uidNumber < $config->get_cfg_value("minId")) {
-        $message[] = msgPool::toosmall(_("UID"), $config->get_cfg_value("minId"));
+      if ($this->uidNumber < $config->get_cfg_value('minId')) {
+        $message[] = msgPool::toosmall(_('UID'), $config->get_cfg_value('minId'));
       }
-      if ($this->gidNumber < $config->get_cfg_value("minId")) {
-        $message[] = msgPool::toosmall(_("GID"), $config->get_cfg_value("minId"));
+      if ($this->gidNumber < $config->get_cfg_value('minId')) {
+        $message[] = msgPool::toosmall(_('GID'), $config->get_cfg_value('minId'));
       }
     }
 
     /* Check shadow settings */
-    if ($this->shadowWarning !== "") {
-      if ($this->shadowMax === "") {
-        $message[] = msgPool::depends("shadowWarning", "shadowMax");
+    if ($this->shadowWarning !== '') {
+      if ($this->shadowMax === '') {
+        $message[] = msgPool::depends('shadowWarning', 'shadowMax');
       }
       if ($this->shadowWarning > $this->shadowMax) {
-        $message[] = msgPool::toobig("shadowWarning", "shadowMax");
+        $message[] = msgPool::toobig('shadowWarning', 'shadowMax');
       }
-      if (($this->shadowMin !== "") && ($this->shadowWarning < $this->shadowMin)) {
-        $message[] = msgPool::toosmall("shadowWarning", "shadowMin");
+      if (($this->shadowMin !== '') && ($this->shadowWarning < $this->shadowMin)) {
+        $message[] = msgPool::toosmall('shadowWarning', 'shadowMin');
       }
     }
 
-    if (($this->shadowInactive !== "") && ($this->shadowMax === "")) {
-      $message[] = msgPool::depends("shadowInactive", "shadowMax");
+    if (($this->shadowInactive !== '') && ($this->shadowMax === '')) {
+      $message[] = msgPool::depends('shadowInactive', 'shadowMax');
     }
-    if (($this->shadowMin !== "") && ($this->shadowMax !== "") &&
+    if (($this->shadowMin !== '') && ($this->shadowMax !== '') &&
         ($this->shadowMin > $this->shadowMax)) {
-      $message[] = msgPool::toobig("shadowMin", "shadowMax");
+      $message[] = msgPool::toobig('shadowMin', 'shadowMax');
     }
 
     return $message;
@@ -458,7 +457,7 @@ class posixAccount extends simplePlugin
     if (isset($this->parent) && $this->parent !== NULL) {
       $this->gecos = rewrite($this->parent->getBaseObject()->cn);
       if (!preg_match('/^[a-z0-9 -]+$/i', $this->gecos)) {
-        $this->gecos = "";
+        $this->gecos = '';
       }
     }
 
@@ -527,6 +526,10 @@ class posixAccount extends simplePlugin
         } else {
           $tabObject  = objects::create('group');
         }
+        if ($this->fromTemplate) {
+          /* When creating a user through a template we bypass ACLs */
+          $tabObject->setIgnoreAcls(TRUE);
+        }
 
         $baseObject = $tabObject->getBaseObject();
 
@@ -560,15 +563,15 @@ class posixAccount extends simplePlugin
         $attrs = $ldap->fetch();
         $this->gidNumber = $attrs['gidNumber'][0];
         @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
-          "Found and used: <i>".$attrs['dn']."</i>",
-          sprintf("Primary group '%s' exists, gidNumber is '%s'.", $this->getUid(), $this->gidNumber));
+          'Found and used: <i>'.$attrs['dn'].'</i>',
+          sprintf('Primary group "%s" exists, gidNumber is "%s".', $this->getUid(), $this->gidNumber));
       }
     } else {
       /* Primary group was selected by user */
       $this->gidNumber = $this->primaryGroup;
       @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
-        sprintf("Primary group '%s' for user '%s' manually selected.",
-        $this->gidNumber, $this->getUid()), "");
+        sprintf('Primary group "%s" for user "%s" manually selected.',
+        $this->gidNumber, $this->getUid()), '');
     }
 
     if (!$this->is_template) {
@@ -590,9 +593,9 @@ class posixAccount extends simplePlugin
     }
 
     /* Trust accounts */
-    if (($this->trustMode != "") && !in_array('hostObject', $this->attrs['objectClass'])) {
+    if (($this->trustMode != '') && !in_array('hostObject', $this->attrs['objectClass'])) {
       $this->attrs['objectClass'][] = 'hostObject';
-    } elseif (($this->trustMode == "") && (($key = array_search('hostObject', $this->attrs['objectClass'])) !== FALSE)) {
+    } elseif (($this->trustMode == '') && (($key = array_search('hostObject', $this->attrs['objectClass'])) !== FALSE)) {
       unset($this->attrs['objectClass'][$key]);
     }
 
@@ -739,6 +742,8 @@ class posixAccount extends simplePlugin
     } elseif (count($this->host) > 0) {
       $this->trustMode = 'byhost';
     }
+
+    $this->fromTemplate = TRUE;
   }
 
   function foreignKeyUpdate ($field, $oldvalue, $newvalue, $source)
@@ -824,7 +829,7 @@ class posixAccount extends simplePlugin
 
     /* Sanity check */
     if ($min >= $max) {
-      msg_dialog::display(_("Error"), _("Cannot allocate a free ID:")." ".sprintf(_("%sPoolMin >= %sPoolMax!"), $attrib), ERROR_DIALOG);
+      msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '.sprintf(_('%sPoolMin >= %sPoolMax!'), $attrib), ERROR_DIALOG);
       return NULL;
     }
 
@@ -974,14 +979,14 @@ class posixAccount extends simplePlugin
   {
     global $config;
 
-    if ($config->get_cfg_value("nextIdHook") != "") {
+    if ($config->get_cfg_value('nextIdHook') != '') {
       /* Call hook script - if present */
-      $command = $config->get_cfg_value("nextIdHook");
+      $command = $config->get_cfg_value('nextIdHook');
 
-      if ($command != "") {
-        $command .= " ".escapeshellarg($dn)." ".escapeshellarg($attrib);
+      if ($command != '') {
+        $command .= ' '.escapeshellarg($dn).' '.escapeshellarg($attrib);
         if (check_command($command)) {
-          @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
+          @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, 'Execute');
           exec($command, $output);
           if (is_numeric($output[0])) {
             return $output[0];
@@ -990,8 +995,8 @@ class posixAccount extends simplePlugin
       }
     }
 
-    msg_dialog::display(_("Warning"), _("'nextIdHook' is not available. Using default base!"), WARNING_DIALOG);
-    return $config->get_cfg_value("uidNumberBase");
+    msg_dialog::display(_('Warning'), _('"nextIdHook" is not available. Using default base!'), WARNING_DIALOG);
+    return $config->get_cfg_value('uidNumberBase');
   }
 }
 ?>
diff --git a/postfix/locale/ar/fusiondirectory.po b/postfix/locale/ar/fusiondirectory.po
index 71dd541f465072ac20130b04cde1bf3f4dd3bc3b..17ee654799d91c44cd546df84da44746e6620616 100644
--- a/postfix/locale/ar/fusiondirectory.po
+++ b/postfix/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/postfix/locale/ca/fusiondirectory.po b/postfix/locale/ca/fusiondirectory.po
index f75ab996e4ae431868c3a5be1511a34df690b955..b10cf2d6654a9617abf6dd2e24f94edcd3964929 100644
--- a/postfix/locale/ca/fusiondirectory.po
+++ b/postfix/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/postfix/locale/cs_CZ/fusiondirectory.po b/postfix/locale/cs_CZ/fusiondirectory.po
index 6a633a18c8767bf12d27925ad80658ef1b6ed638..97beef1d065901e143033bd5197aa3732f4c387a 100644
--- a/postfix/locale/cs_CZ/fusiondirectory.po
+++ b/postfix/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/postfix/locale/de/fusiondirectory.po b/postfix/locale/de/fusiondirectory.po
index 2f5f771c1aa213d30e9b52574e425152497e42d8..7c2cca40bf3ef378e78706b89f9297ab0c0d314d 100644
--- a/postfix/locale/de/fusiondirectory.po
+++ b/postfix/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/postfix/locale/el_GR/fusiondirectory.po b/postfix/locale/el_GR/fusiondirectory.po
index 6822a18c42c533aaa2e5e6a7dcd35d2b3ed80756..8a1a8a8ef148233385fc9a69cfbf1bd2cd9e836b 100644
--- a/postfix/locale/el_GR/fusiondirectory.po
+++ b/postfix/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/postfix/locale/en/fusiondirectory.po b/postfix/locale/en/fusiondirectory.po
index adf697e66630564f68c07c751c46396c98a81ff7..a5bf977e2935d848823de572153e666067497b3d 100644
--- a/postfix/locale/en/fusiondirectory.po
+++ b/postfix/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/postfix/locale/es/fusiondirectory.po b/postfix/locale/es/fusiondirectory.po
index caaaf5c471ceb0935220a97bc9f78622e452ed02..3593f58c0a0b6053b81569745885ff0a7493ed77 100644
--- a/postfix/locale/es/fusiondirectory.po
+++ b/postfix/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/postfix/locale/es_CO/fusiondirectory.po b/postfix/locale/es_CO/fusiondirectory.po
index 33dc5b7c65605f3f5dbee2a33ada1fb6e09d6f2e..575699e5a5df7477855bb33f25715a05451a7177 100644
--- a/postfix/locale/es_CO/fusiondirectory.po
+++ b/postfix/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/postfix/locale/es_VE/fusiondirectory.po b/postfix/locale/es_VE/fusiondirectory.po
index d833952e4bd11a92ebbcf828fb9fd9e2cbc56062..742f54139fd5c7b760337b0917313a1704571f96 100644
--- a/postfix/locale/es_VE/fusiondirectory.po
+++ b/postfix/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/postfix/locale/fa_IR/fusiondirectory.po b/postfix/locale/fa_IR/fusiondirectory.po
index 4ca0e0728f0ad8ec43fbf4d1f4c180436d870bcb..6dc336ddff1f02cde03680115e44534c61488a3e 100644
--- a/postfix/locale/fa_IR/fusiondirectory.po
+++ b/postfix/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/fi_FI/fusiondirectory.po b/postfix/locale/fi_FI/fusiondirectory.po
index 937aea4e02086ecb9f71dedfd49526d72655cc39..b841d99785a4d23f804f8d10c6033295bdfed2e5 100644
--- a/postfix/locale/fi_FI/fusiondirectory.po
+++ b/postfix/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/postfix/locale/fr/fusiondirectory.po b/postfix/locale/fr/fusiondirectory.po
index 8d08b796ad135af46e8232a4b9da5b0f1513c9b7..3aa8d4a4631116bd238543c9f693822afe7dbd15 100644
--- a/postfix/locale/fr/fusiondirectory.po
+++ b/postfix/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/postfix/locale/hu_HU/fusiondirectory.po b/postfix/locale/hu_HU/fusiondirectory.po
index 70ea94fee275e4020e32ee5946c7d1e79f286782..15f9df1a53ff8dd53511cd2ff645a5c62d3e7196 100644
--- a/postfix/locale/hu_HU/fusiondirectory.po
+++ b/postfix/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/id/fusiondirectory.po b/postfix/locale/id/fusiondirectory.po
index 770e6062269d80638a00c5bd3267ef1a28fe1f66..f070fe663ef0d9037b287c1bb69dd5c5e43338ce 100644
--- a/postfix/locale/id/fusiondirectory.po
+++ b/postfix/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/it_IT/fusiondirectory.po b/postfix/locale/it_IT/fusiondirectory.po
index 03cf6445bf452fd28aa86069f6d1c77e5d8c917a..f43fb2bd2999a079ac10b0fdd5651a54a7847229 100644
--- a/postfix/locale/it_IT/fusiondirectory.po
+++ b/postfix/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/postfix/locale/lv/fusiondirectory.po b/postfix/locale/lv/fusiondirectory.po
index 89a34eb714015371936fb2df3b51017acfee77d8..cd2c62796d9e2db93dd1623d54873dadbf073bcf 100644
--- a/postfix/locale/lv/fusiondirectory.po
+++ b/postfix/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/postfix/locale/nb/fusiondirectory.po b/postfix/locale/nb/fusiondirectory.po
index 84628ff6cff88be40f1fb900f5a55c212ee02cde..f310079ae2865c1417c772283109626329206d1f 100644
--- a/postfix/locale/nb/fusiondirectory.po
+++ b/postfix/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/nl/fusiondirectory.po b/postfix/locale/nl/fusiondirectory.po
index 35bff466614b010a73c8e99e98a402e4c2d8ba92..7969ef56f594456a6fc039604817d4d2124615bb 100644
--- a/postfix/locale/nl/fusiondirectory.po
+++ b/postfix/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/postfix/locale/pl/fusiondirectory.po b/postfix/locale/pl/fusiondirectory.po
index da19ef0b7b7294603780c4ed23765308ece56de0..df4c26a7d2e73c4cd1bbcd0c0452f47cce7b9819 100644
--- a/postfix/locale/pl/fusiondirectory.po
+++ b/postfix/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
diff --git a/postfix/locale/pt/fusiondirectory.po b/postfix/locale/pt/fusiondirectory.po
index 8ff71098d2a56ec0ae82faaf45da24e849281f6e..65a5b5cb9d49c4027ae66e20085759f52685efef 100644
--- a/postfix/locale/pt/fusiondirectory.po
+++ b/postfix/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/postfix/locale/pt_BR/fusiondirectory.po b/postfix/locale/pt_BR/fusiondirectory.po
index 53b7b3f1dfc557e047b36ef8f6ac783ed29f662a..c6e91b51eb7d2fb29fe2c351be9c7d141dc0921f 100644
--- a/postfix/locale/pt_BR/fusiondirectory.po
+++ b/postfix/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/postfix/locale/ru/fusiondirectory.po b/postfix/locale/ru/fusiondirectory.po
index 7131f05a0bf1034e97dd2ef25be26a4e8e843a97..861113867c531f1059ccb38bc45be369f86926ef 100644
--- a/postfix/locale/ru/fusiondirectory.po
+++ b/postfix/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/postfix/locale/ru@petr1708/fusiondirectory.po b/postfix/locale/ru@petr1708/fusiondirectory.po
index aac0974919c85a798266efa5861069c103526aa6..502397ae3c7b32e046be75050e2b2322a8c64800 100644
--- a/postfix/locale/ru@petr1708/fusiondirectory.po
+++ b/postfix/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/sv/fusiondirectory.po b/postfix/locale/sv/fusiondirectory.po
index 6d8de83ea1c3a9838e57004b841d45bdf13c7519..50bba1decc0cbb102eafe10c6382c6f9251dfc80 100644
--- a/postfix/locale/sv/fusiondirectory.po
+++ b/postfix/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/postfix/locale/ug/fusiondirectory.po b/postfix/locale/ug/fusiondirectory.po
index 1ef5f24a41a0b356a3cddf06831198203e437f6e..18148a93953b7ae3f99071135a940dbdb81d1058 100644
--- a/postfix/locale/ug/fusiondirectory.po
+++ b/postfix/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/vi_VN/fusiondirectory.po b/postfix/locale/vi_VN/fusiondirectory.po
index f54fc77b9fecaa00a6811d32fa47bf2a2d5a74a3..da8c794766d71a38d641647a2d73ac5ea1c9ddc2 100644
--- a/postfix/locale/vi_VN/fusiondirectory.po
+++ b/postfix/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/postfix/locale/zh/fusiondirectory.po b/postfix/locale/zh/fusiondirectory.po
index df05e5b4b89ad9f20a2103af0ceb7e3a741ea37a..be6fe86deb0d1921a0dd7f68c3453c4c0bac4967 100644
--- a/postfix/locale/zh/fusiondirectory.po
+++ b/postfix/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc b/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
index 6b6215f7ebc6528ae53930af3a4c9fa2fa465746..e65104ba753acf53381d8b7767920674b4d139dc 100644
--- a/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
+++ b/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
@@ -52,6 +52,20 @@ class dashboardPpolicy extends simplePlugin
   {
     parent::__construct($dn, $object, $parent, $mainTab);
 
+    $this->expiredAccountsColumns = array(
+      'user' => array(
+        'uid'             => _('Login'),
+        'cn'              => _('Name'),
+        'telephoneNumber' => _('Phone number'),
+        'expirationDate'  => _('Expiration date'),
+      ),
+      'manager' => array(
+        'manager_cn'      => _('Name'),
+        'manager_mail'    => _('Email'),
+        'manager_phone'   => _('Phone number'),
+      )
+    );
+
     $this->compute_accounts_info();
   }
 
@@ -139,16 +153,23 @@ class dashboardPpolicy extends simplePlugin
         /* No max age, it can’t be expired */
         continue;
       }
-      $lastChange = LdapGeneralizedTime::fromString($user['pwdChangedTime']);
-      $lastChange->setTimezone(timezone::utc());
-      if (($lastChange->getTimeStamp() + $maxAge) < $now->getTimeStamp()) {
-        $expired_accounts[] = dashboardUsers::get_user_infos($user);
-      } elseif (($lastChange->getTimeStamp() + $maxAge) < ($now->getTimeStamp() + $next_expired_days_seconds)) {
-        $next_expired_accounts[] = dashboardUsers::get_user_infos($user);
+      /* Build expiration date from pwdChangedTime and max age */
+      $expDate = LdapGeneralizedTime::fromString($user['pwdChangedTime']);
+      $expDate->setTimezone(timezone::utc());
+      $expDate->add(new DateInterval('PT'.$maxAge.'S'));
+      if ($expDate->getTimeStamp() < $now->getTimeStamp()) {
+        $expired_account = dashboardUsers::get_user_infos($user);
+        $expired_account['expirationDate'] = $expDate->format('d.m.Y');
+        $expired_accounts[] = $expired_account;
+      } elseif ($expDate->getTimeStamp() < ($now->getTimeStamp() + $next_expired_days_seconds)) {
+        $expired_account = dashboardUsers::get_user_infos($user);
+        $expired_account['expirationDate'] = $expDate->format('d.m.Y');
+        $next_expired_accounts[] = $expired_account;
       }
     }
 
     $this->expired = array(
+      'columns'             => $this->expiredAccountsColumns,
       'accounts'            => $expired_accounts,
       'accounts_next_days'  => $next_expired_accounts,
       'next_days'           => $next_expired_days,
diff --git a/ppolicy/locale/ar/fusiondirectory.po b/ppolicy/locale/ar/fusiondirectory.po
index 433bad29bb8211f037576102939ccdd2b10460b7..5dc55bbb65fac1cc435206df8a8ce58bf12a2e5a 100644
--- a/ppolicy/locale/ar/fusiondirectory.po
+++ b/ppolicy/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "الإسم"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/ca/fusiondirectory.po b/ppolicy/locale/ca/fusiondirectory.po
index f647afd1d7e8cd1b6c53ea53046f616c85286273..765707a21fd1c1c34b38c9e89a463481ae1e4846 100644
--- a/ppolicy/locale/ca/fusiondirectory.po
+++ b/ppolicy/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Entrada"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nom"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Número de telèfon"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Error de la configuració"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/cs_CZ/fusiondirectory.po b/ppolicy/locale/cs_CZ/fusiondirectory.po
index 80aaed3f6640e427d5407eece1d3464e69a8ab62..bea2613e4e0547a204f30d03fa59510064dba5a6 100644
--- a/ppolicy/locale/cs_CZ/fusiondirectory.po
+++ b/ppolicy/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -102,17 +102,39 @@ msgstr "Účty, jejichž platnost skončila"
 msgid "Locked accounts"
 msgstr "Uzamčené účty"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "uživatelské jméno"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "název"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "telefonní číslo"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Datum vypršení platnosti"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "E-mail"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "chyba v nastavení"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Výchozí ppolicy %s nebyla v LDAP nalezena!"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr "Zásada Ppolicy %s, nastavená pro uživatele %s nebyla v LDAP nalezena!"
diff --git a/ppolicy/locale/de/fusiondirectory.po b/ppolicy/locale/de/fusiondirectory.po
index 2f145f40edcfdaef5a98fb00d1891e3d0ad9674b..cc4241e667720a9091c178bbd5da22301f1d9cf2 100644
--- a/ppolicy/locale/de/fusiondirectory.po
+++ b/ppolicy/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -102,17 +102,39 @@ msgstr "Abgelaufene Konten"
 msgid "Locked accounts"
 msgstr "Gesperrte Konten"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Kennung"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Name"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Ablaufdatum"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Email"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/el_GR/fusiondirectory.po b/ppolicy/locale/el_GR/fusiondirectory.po
index 0350033be6dedcf0963e55011e740fe226a0383c..e2dd757c29c4256791d5cb0e75997331308c2116 100644
--- a/ppolicy/locale/el_GR/fusiondirectory.po
+++ b/ppolicy/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -102,17 +102,39 @@ msgstr "Λογαριασμοί που έχουν λήξει"
 msgid "Locked accounts"
 msgstr "Κλειδωμένοι λογαριασμοί"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Όνομα"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Αριθμός τηλεφώνου"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Ημερομηνία λήξης"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Ηλ. διεύθυνση"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Σφάλμα ρύθμισης"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Δεν ήταν δυνατή η εύρεση του Ppolicy \"%s\" στο LDAP!"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/en/fusiondirectory.po b/ppolicy/locale/en/fusiondirectory.po
index a41fee4bc12518fe55e3a261f6e1e2723980feb4..e7cf24d258b8a045bb5d6069c0c19f4d305e888f 100644
--- a/ppolicy/locale/en/fusiondirectory.po
+++ b/ppolicy/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/es/fusiondirectory.po b/ppolicy/locale/es/fusiondirectory.po
index b50993066504b64cef83cae2661bc06dfa870fbe..ac0a046c58ff07bec63105d6af3d86e802b0cb09 100644
--- a/ppolicy/locale/es/fusiondirectory.po
+++ b/ppolicy/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Inicio"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nombre"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Número de teléfono"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/es_CO/fusiondirectory.po b/ppolicy/locale/es_CO/fusiondirectory.po
index e6dc2088cda130a20938bc666bee5e7d7a03b52e..4576bf34f8ff55d0aaaaade4fce9e7ccf081a405 100644
--- a/ppolicy/locale/es_CO/fusiondirectory.po
+++ b/ppolicy/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -102,17 +102,39 @@ msgstr "Cuentas expiradas"
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Usuario"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nombre"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Teléfono"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Error de configuración"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/es_VE/fusiondirectory.po b/ppolicy/locale/es_VE/fusiondirectory.po
index ddae668f0c5704c54a1d3ca7c3d6bcbb4cc1712b..d35134762210064fc11f504a11d091b1888925ed 100644
--- a/ppolicy/locale/es_VE/fusiondirectory.po
+++ b/ppolicy/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Inicio"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nombre"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Número de teléfono"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/fa_IR/fusiondirectory.po b/ppolicy/locale/fa_IR/fusiondirectory.po
index 2a43d0fcc42c9c7605dc743deeb0a49e83065024..a57089a099ebe24e8dc9d0f39efb87e4ec1282b9 100644
--- a/ppolicy/locale/fa_IR/fusiondirectory.po
+++ b/ppolicy/locale/fa_IR/fusiondirectory.po
@@ -8,8 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -101,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "پست الکترونیک"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/fi_FI/fusiondirectory.po b/ppolicy/locale/fi_FI/fusiondirectory.po
index b25233c76e6c4ab27239dd7625fc4f5ea2526819..0f964dec1c526d2f351d9f493c6fe64fb7f5b67c 100644
--- a/ppolicy/locale/fi_FI/fusiondirectory.po
+++ b/ppolicy/locale/fi_FI/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Dina Solveig Jalkanen <dinsteri@gmail.com>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nimi"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Eräpäivä"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Sähköposti"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/fr/fusiondirectory.po b/ppolicy/locale/fr/fusiondirectory.po
index c394172de1455b4a8117e2ece40f0ef2250cb40b..4a71cf04e25e994fbb8c5b1777fd4b334c37434b 100644
--- a/ppolicy/locale/fr/fusiondirectory.po
+++ b/ppolicy/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -104,17 +104,39 @@ msgstr "Comptes expirés"
 msgid "Locked accounts"
 msgstr "Comptes verrouillés "
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Identifiant"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nom"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Numéro de téléphone"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Date d'expiration"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Courriel"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "La ppolicy par défaut \"%s\" n’a pas été trouvée dans le LDAP !"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
@@ -123,19 +145,19 @@ msgstr ""
 
 #: config/ppolicy/class_ppolicyConfig.inc:29
 msgid "Ppolicy plugin configuration"
-msgstr "Configuration de l'extension Ppolicy"
+msgstr "Configuration ppolicy"
 
 #: config/ppolicy/class_ppolicyConfig.inc:30
 msgid "FusionDirectory ppolicy plugin configuration"
-msgstr "Configuration du plugin Ppolicy"
+msgstr "Configuration du plugin ppolicy"
 
 #: config/ppolicy/class_ppolicyConfig.inc:43
 msgid "Ppolicy plugin"
-msgstr "Plugin Ppolicy"
+msgstr "Plugin ppolicy"
 
 #: config/ppolicy/class_ppolicyConfig.inc:46
 msgid "Ppolicy RDN"
-msgstr "Ppolicy RDN"
+msgstr "Branche ppolicy"
 
 #: config/ppolicy/class_ppolicyConfig.inc:46
 msgid "Branch in which ppolicies will be stored"
diff --git a/ppolicy/locale/hu_HU/fusiondirectory.po b/ppolicy/locale/hu_HU/fusiondirectory.po
index f331f460cf76a4b2bd9a49b0e4f134abf9dfc9d0..1ac98c6fabb68f89d53892ee9b1b5445ff99c578 100644
--- a/ppolicy/locale/hu_HU/fusiondirectory.po
+++ b/ppolicy/locale/hu_HU/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Szabi Fekete <szabi@equio.co.uk>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Név"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Telefonszám"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/id/fusiondirectory.po b/ppolicy/locale/id/fusiondirectory.po
index 159801c95290e492ddcc076a62f50df4ffec9c19..c2f727042a1b9cae44a629abf45ec0dff79207f2 100644
--- a/ppolicy/locale/id/fusiondirectory.po
+++ b/ppolicy/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -101,17 +101,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/it_IT/fusiondirectory.po b/ppolicy/locale/it_IT/fusiondirectory.po
index 0f9c3533bebb69f56bd1f014b4a9538a45804bd7..5f41e780ce1b0fec82a8e8d3013e891d1e9017cb 100644
--- a/ppolicy/locale/it_IT/fusiondirectory.po
+++ b/ppolicy/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -104,17 +104,39 @@ msgstr "Account scaduti"
 msgid "Locked accounts"
 msgstr "Account bloccati"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Nome utente"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nome"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Numero di telefono"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Data di scadenza"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Indirizzo di posta elettronica"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "La ppolicy \"%s\" predefinta non é stata trovata nell'annuario LDAP"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/lv/fusiondirectory.po b/ppolicy/locale/lv/fusiondirectory.po
index 84b112715bf8c8b1031e5015b6c69e46facf73f2..3db4796ff5d79a257938ba898152d7accb2a83e3 100644
--- a/ppolicy/locale/lv/fusiondirectory.po
+++ b/ppolicy/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Vārds "
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Derīguma termiņš"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "E-pasts"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/nb/fusiondirectory.po b/ppolicy/locale/nb/fusiondirectory.po
index 51cd369792b04e4f97696c37399d321dc85d4ffb..a4eb6c5083565f51d653880e5d56cf2fe3c7d17c 100644
--- a/ppolicy/locale/nb/fusiondirectory.po
+++ b/ppolicy/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Navn"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/nl/fusiondirectory.po b/ppolicy/locale/nl/fusiondirectory.po
index d2cb93c277446142406a68410e9937a171fae756..ffd9d5507ee618a0af6e57ab132c181e723b60c0 100644
--- a/ppolicy/locale/nl/fusiondirectory.po
+++ b/ppolicy/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -102,17 +102,39 @@ msgstr "Vervallen accounts"
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Inlognaam"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Naam"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Telefoonnummer"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Vervaldatum"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "E-mail"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Configuratie fout"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/pl/fusiondirectory.po b/ppolicy/locale/pl/fusiondirectory.po
index 6a8004d4ed7f06b74778090d075e1df303cb2141..1d966395dffe1ffd0e69c1865ab33a17f2d16fe8 100644
--- a/ppolicy/locale/pl/fusiondirectory.po
+++ b/ppolicy/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:29
 #: personal/ppolicy/class_ppolicyAccount.inc:44
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Login"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "ImiÄ™"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Numer telefonu"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Email"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Błąd konfiguracji"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/pt/fusiondirectory.po b/ppolicy/locale/pt/fusiondirectory.po
index bc392509497beb894242e5f654042c10b4178932..dd808fe2392d32648e11894f18399c64bd8029c2 100644
--- a/ppolicy/locale/pt/fusiondirectory.po
+++ b/ppolicy/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Login"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nome"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/pt_BR/fusiondirectory.po b/ppolicy/locale/pt_BR/fusiondirectory.po
index ca6db7da8615e919fc66ed5cf91fcb84d4404e05..c0739d2cb48c66a9ed78a9f54aee5deaabc367d3 100644
--- a/ppolicy/locale/pt_BR/fusiondirectory.po
+++ b/ppolicy/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -102,17 +102,39 @@ msgstr "Contas expiradas"
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Login"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Nome"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Número de telefone"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Data de expiração"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Email"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/ru/fusiondirectory.po b/ppolicy/locale/ru/fusiondirectory.po
index 41eb361786b1f2b7e7b21fe558b11392eec621e6..ba0b97333fd513125e40f754275706349068d5ff 100644
--- a/ppolicy/locale/ru/fusiondirectory.po
+++ b/ppolicy/locale/ru/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Alexey Matveev <Tippet@yandex.ru>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,17 +102,39 @@ msgstr "Просроченные учетные записи"
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Имя пользователя"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Название"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Телефон"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Дата окончания действия"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "Email"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Ошибка конфигурации"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/ru@petr1708/fusiondirectory.po b/ppolicy/locale/ru@petr1708/fusiondirectory.po
index c34b0a8bf05d40737802f8b411c9d017ec324261..887553315aa3e94739f366d93641a99d0ac86dcf 100644
--- a/ppolicy/locale/ru@petr1708/fusiondirectory.po
+++ b/ppolicy/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -101,17 +101,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/sv/fusiondirectory.po b/ppolicy/locale/sv/fusiondirectory.po
index ee23acf4eb4956b39322fb1015676a805377a627..55734f1ae0789ac519aa34c15dee621504b97c83 100644
--- a/ppolicy/locale/sv/fusiondirectory.po
+++ b/ppolicy/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Användarnamn"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Namn"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr "Utgångsdatum"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/ug/fusiondirectory.po b/ppolicy/locale/ug/fusiondirectory.po
index 8d8ce8833c8262e48b3053fc87885a845f4c11e6..43c43140f70e7bd52b3245a7294addb313c82753 100644
--- a/ppolicy/locale/ug/fusiondirectory.po
+++ b/ppolicy/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -101,17 +101,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/vi_VN/fusiondirectory.po b/ppolicy/locale/vi_VN/fusiondirectory.po
index cadc78679ad29000835b6bd6b3446c34d3b4a5ee..88e664444a5f240dbd671642d679caed46e4219f 100644
--- a/ppolicy/locale/vi_VN/fusiondirectory.po
+++ b/ppolicy/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "Đăng nhập"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "Tên"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/zh/fusiondirectory.po b/ppolicy/locale/zh/fusiondirectory.po
index 72e0ac19941c5673ff9f88a21c1ce7eca5b9ca47..5a5a155545172461bf1f2a527455edba49ebd58b 100644
--- a/ppolicy/locale/zh/fusiondirectory.po
+++ b/ppolicy/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -102,17 +102,39 @@ msgstr ""
 msgid "Locked accounts"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
+#: addons/dashboard/class_dashBoardPPolicy.inc:57
+msgid "Login"
+msgstr "登录名"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+#: addons/dashboard/class_dashBoardPPolicy.inc:63
+msgid "Name"
+msgstr "名称"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Phone number"
+msgstr "电话号码"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Email"
+msgstr "邮件"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:85
+#: addons/dashboard/class_dashBoardPPolicy.inc:138
 msgid "Configuration error"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/puppet/locale/ar/fusiondirectory.po b/puppet/locale/ar/fusiondirectory.po
index b8f09c8cc8265d6d4baf2bc430cdec1633e7045c..e034a947c1285bbfba9e2e0a66050441f4812b99 100644
--- a/puppet/locale/ar/fusiondirectory.po
+++ b/puppet/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/ca/fusiondirectory.po b/puppet/locale/ca/fusiondirectory.po
index b8ce493cf1c77e689b988d24d23e0d53b5a3987f..51a9a340835cf77788a1a96131b71fe3a71a2fff 100644
--- a/puppet/locale/ca/fusiondirectory.po
+++ b/puppet/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/cs_CZ/fusiondirectory.po b/puppet/locale/cs_CZ/fusiondirectory.po
index 7a617e990584d3f188384626dc0b8e5519822698..80267508eaa117f17b27453d0a9c06b7a9da9e51 100644
--- a/puppet/locale/cs_CZ/fusiondirectory.po
+++ b/puppet/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/puppet/locale/de/fusiondirectory.po b/puppet/locale/de/fusiondirectory.po
index 7b2371def8edd7f40f8801cde9d0c23ea51af32e..ee08348a6037ed9495becf6e88b8241746d11270 100644
--- a/puppet/locale/de/fusiondirectory.po
+++ b/puppet/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/puppet/locale/el_GR/fusiondirectory.po b/puppet/locale/el_GR/fusiondirectory.po
index a6d9eb880a128ca14a7ee8464459fe8d8a72f801..91c60a3ec946931011e9175c1b6afc67ce542698 100644
--- a/puppet/locale/el_GR/fusiondirectory.po
+++ b/puppet/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/puppet/locale/en/fusiondirectory.po b/puppet/locale/en/fusiondirectory.po
index a6af381dd62a10dd6866f14a5b495a903c28961e..7b3fcb7a33cb463de7c7baa8bb11a9ec9bd7f691 100644
--- a/puppet/locale/en/fusiondirectory.po
+++ b/puppet/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/puppet/locale/es/fusiondirectory.po b/puppet/locale/es/fusiondirectory.po
index bb3aee3334ad2cfae24c43ff48558e019929fda3..68a6954a3823c8e341c24f00542c38e54a0d65a8 100644
--- a/puppet/locale/es/fusiondirectory.po
+++ b/puppet/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/puppet/locale/es_CO/fusiondirectory.po b/puppet/locale/es_CO/fusiondirectory.po
index baab4bb49cd15d35158e6c4f11b7d7d63698012d..1d62c99891e0c4eec29e440e56e5dda328bddb05 100644
--- a/puppet/locale/es_CO/fusiondirectory.po
+++ b/puppet/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/es_VE/fusiondirectory.po b/puppet/locale/es_VE/fusiondirectory.po
index 92ce357c138393a3d66940c38ded294905921c9f..530161d55125e0c3fd2840b4c138575dbf25c306 100644
--- a/puppet/locale/es_VE/fusiondirectory.po
+++ b/puppet/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/puppet/locale/fa_IR/fusiondirectory.po b/puppet/locale/fa_IR/fusiondirectory.po
index 3ef664a37248c87c178f6adc6c4b3cc54d184885..33b409a95847f2f1ad0d58a3a93a53e0421d9c1a 100644
--- a/puppet/locale/fa_IR/fusiondirectory.po
+++ b/puppet/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/fi_FI/fusiondirectory.po b/puppet/locale/fi_FI/fusiondirectory.po
index 94ab385f294299346f6069fc4fd61dbc932bae26..1f51e482f50e426e012e33632ba27e52fba5912b 100644
--- a/puppet/locale/fi_FI/fusiondirectory.po
+++ b/puppet/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/fr/fusiondirectory.po b/puppet/locale/fr/fusiondirectory.po
index 5460716836be56737d079a4d2a87e3550c597d24..c7df1642282073c3ffe14a3108db6a3bd2d7ad88 100644
--- a/puppet/locale/fr/fusiondirectory.po
+++ b/puppet/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/puppet/locale/hu_HU/fusiondirectory.po b/puppet/locale/hu_HU/fusiondirectory.po
index 617f6dfc9497a9c7d0ce6cbcdc39dc4a6948554d..e889444f9962c08cc81aa50262e242e04d5ec002 100644
--- a/puppet/locale/hu_HU/fusiondirectory.po
+++ b/puppet/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/id/fusiondirectory.po b/puppet/locale/id/fusiondirectory.po
index 1be6269b5de9d5f8e084ba7cbaa7b23819d022e3..55abd46c7f34e74592205f1affab5b5797e00b15 100644
--- a/puppet/locale/id/fusiondirectory.po
+++ b/puppet/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/it_IT/fusiondirectory.po b/puppet/locale/it_IT/fusiondirectory.po
index 700ac47f9908b4ed31b260b38da2681ff97ef644..d9fe0335a48b0743e47dcc96f1dae9aa77785385 100644
--- a/puppet/locale/it_IT/fusiondirectory.po
+++ b/puppet/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/puppet/locale/lv/fusiondirectory.po b/puppet/locale/lv/fusiondirectory.po
index 41f81add229f63bc0e9d0426dfadfd6f0c1d3d17..7b6e5c829734fb697d9adbbc5533e0b6ee875b2e 100644
--- a/puppet/locale/lv/fusiondirectory.po
+++ b/puppet/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/nb/fusiondirectory.po b/puppet/locale/nb/fusiondirectory.po
index 3748a9eb630cbed89c42b220e812569c3346735f..7a8d30453f11580efa6e0eeb2e3c9e20451a1c3a 100644
--- a/puppet/locale/nb/fusiondirectory.po
+++ b/puppet/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/nl/fusiondirectory.po b/puppet/locale/nl/fusiondirectory.po
index 07815ea4afaf3b65a762187d5ec00d40b72d2f66..1f19bb185abf8405cf87d469647f90ea153426e8 100644
--- a/puppet/locale/nl/fusiondirectory.po
+++ b/puppet/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/puppet/locale/pl/fusiondirectory.po b/puppet/locale/pl/fusiondirectory.po
index 9852e4f0c92b6f99499b82d1fbce2865d1a16d34..0b9cfb0a3dd5c807bde31db4c3d918f2da78a39c 100644
--- a/puppet/locale/pl/fusiondirectory.po
+++ b/puppet/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
diff --git a/puppet/locale/pt/fusiondirectory.po b/puppet/locale/pt/fusiondirectory.po
index 830574e475fc97f12332a5746d1b6477798a5be8..68e8179164c674e892ef7e311f8a5bac9bb2ac33 100644
--- a/puppet/locale/pt/fusiondirectory.po
+++ b/puppet/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/puppet/locale/pt_BR/fusiondirectory.po b/puppet/locale/pt_BR/fusiondirectory.po
index 1d8f22162f0b68f7350d21aa0c4b1d533bfa3697..122c9c64e11cdc76c8a4a3fc15d38597a8b0565f 100644
--- a/puppet/locale/pt_BR/fusiondirectory.po
+++ b/puppet/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/puppet/locale/ru/fusiondirectory.po b/puppet/locale/ru/fusiondirectory.po
index 451410cffc8393437138074def2e785644735895..61ea50d2fc5b2e35aedf90fdbbb85c6ea2fc2c82 100644
--- a/puppet/locale/ru/fusiondirectory.po
+++ b/puppet/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/puppet/locale/ru@petr1708/fusiondirectory.po b/puppet/locale/ru@petr1708/fusiondirectory.po
index 237eddc038309ed45f2c15511cd153fd654f652f..51d20d9f8b60d0f55340daacb4a44c8401f9ee22 100644
--- a/puppet/locale/ru@petr1708/fusiondirectory.po
+++ b/puppet/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/sv/fusiondirectory.po b/puppet/locale/sv/fusiondirectory.po
index 2695638bc862f43866177f7cf6bcc3522195cb73..b9bccd92c51309c27a1a7e6a7256d90fe55fd24b 100644
--- a/puppet/locale/sv/fusiondirectory.po
+++ b/puppet/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/puppet/locale/ug/fusiondirectory.po b/puppet/locale/ug/fusiondirectory.po
index d8bf57f3b653d62f9d8897093422f43a62b71fc6..9b0b29ff00f58498f3705e302369f3c53768c0d4 100644
--- a/puppet/locale/ug/fusiondirectory.po
+++ b/puppet/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/vi_VN/fusiondirectory.po b/puppet/locale/vi_VN/fusiondirectory.po
index 149beed5e22bae8db1a443011715fc54a71a6dc7..b520d1e25cc400cf640154de37c9e5fc0bb77f3d 100644
--- a/puppet/locale/vi_VN/fusiondirectory.po
+++ b/puppet/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/puppet/locale/zh/fusiondirectory.po b/puppet/locale/zh/fusiondirectory.po
index af8928c423f1c53ab23febb8c27e9bb1ef910536..78b48ff50e38adf0260e2e43235e01f525672016 100644
--- a/puppet/locale/zh/fusiondirectory.po
+++ b/puppet/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/pureftpd/locale/ar/fusiondirectory.po b/pureftpd/locale/ar/fusiondirectory.po
index f027e8b7d94edb1763c49b3224c26ee879cec524..64469c643f382795013f9aebf5d36faf331a4c0d 100644
--- a/pureftpd/locale/ar/fusiondirectory.po
+++ b/pureftpd/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/ca/fusiondirectory.po b/pureftpd/locale/ca/fusiondirectory.po
index 671144346700cd21bc42d535d925182276332ed7..817cb0a2d97eb72f5b61e0a60b2bda201b6e7a0b 100644
--- a/pureftpd/locale/ca/fusiondirectory.po
+++ b/pureftpd/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/cs_CZ/fusiondirectory.po b/pureftpd/locale/cs_CZ/fusiondirectory.po
index 0183947071cf723e6d7f634e2bba9a98a280d8b4..47d77793724db2cb4ce15f0354a393f88008d2d7 100644
--- a/pureftpd/locale/cs_CZ/fusiondirectory.po
+++ b/pureftpd/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/pureftpd/locale/de/fusiondirectory.po b/pureftpd/locale/de/fusiondirectory.po
index 40473ef9dfe656f4f97eeb8e35e81326c4070984..52ebdd0165bcd1d2f5360c062853d7cb9222f94a 100644
--- a/pureftpd/locale/de/fusiondirectory.po
+++ b/pureftpd/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/pureftpd/locale/el_GR/fusiondirectory.po b/pureftpd/locale/el_GR/fusiondirectory.po
index 320394a222ae071890d3585c4f87f12f13d7318a..267df720a18bf687d72ad68f9bbbd027ad2a2d42 100644
--- a/pureftpd/locale/el_GR/fusiondirectory.po
+++ b/pureftpd/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/pureftpd/locale/en/fusiondirectory.po b/pureftpd/locale/en/fusiondirectory.po
index 44570fb5fcaa30ea2400a2c6d348cb6c6a8ae834..8fbb786c62daa97a227312b2b8c54eb621e75eeb 100644
--- a/pureftpd/locale/en/fusiondirectory.po
+++ b/pureftpd/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/pureftpd/locale/es/fusiondirectory.po b/pureftpd/locale/es/fusiondirectory.po
index 9a81b7e64c4c9a0f42f3848f3a41c0b90b545b6e..28ba5e26258429cffd8f1a6c3343517de77e6d48 100644
--- a/pureftpd/locale/es/fusiondirectory.po
+++ b/pureftpd/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/pureftpd/locale/es_CO/fusiondirectory.po b/pureftpd/locale/es_CO/fusiondirectory.po
index cb05a0884cf98d62f9928f8e11accbfd295d7e05..dd6daf70325ef06908cd98cb2d776164a17e8e5c 100644
--- a/pureftpd/locale/es_CO/fusiondirectory.po
+++ b/pureftpd/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/pureftpd/locale/es_VE/fusiondirectory.po b/pureftpd/locale/es_VE/fusiondirectory.po
index a9a65601ba464f0733d8443db63a7608ca1599af..cea5685af446f347f3afbbf8d70ce99f94368986 100644
--- a/pureftpd/locale/es_VE/fusiondirectory.po
+++ b/pureftpd/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/pureftpd/locale/fa_IR/fusiondirectory.po b/pureftpd/locale/fa_IR/fusiondirectory.po
index cdc3f7abe749f0e795fdd4d3d32f6ae60130e7ba..0f38a204122361d0ee25fe143e02f16d6c7aca59 100644
--- a/pureftpd/locale/fa_IR/fusiondirectory.po
+++ b/pureftpd/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/fi_FI/fusiondirectory.po b/pureftpd/locale/fi_FI/fusiondirectory.po
index 3120a2280022d046b0bcb92f1561be244e8304ba..60d51558855a01df77392e35fd8e73ed982cb341 100644
--- a/pureftpd/locale/fi_FI/fusiondirectory.po
+++ b/pureftpd/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/fr/fusiondirectory.po b/pureftpd/locale/fr/fusiondirectory.po
index 1fa3417a375488d6270d654b90f46ff0650ed193..e90a56878dd574514cfda8299e49c90cd6f78fd9 100644
--- a/pureftpd/locale/fr/fusiondirectory.po
+++ b/pureftpd/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/pureftpd/locale/hu_HU/fusiondirectory.po b/pureftpd/locale/hu_HU/fusiondirectory.po
index 5bd65cded20adf727fcc2e0f6269462ed1edd342..c1e29533107ed29436802e8cda75a08fdc10c53b 100644
--- a/pureftpd/locale/hu_HU/fusiondirectory.po
+++ b/pureftpd/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/id/fusiondirectory.po b/pureftpd/locale/id/fusiondirectory.po
index 64d5b337ad56cc60274b4168907c020d635d6fdd..41b9d081a04f3e49c60420ffe7aae43fcbc316eb 100644
--- a/pureftpd/locale/id/fusiondirectory.po
+++ b/pureftpd/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/it_IT/fusiondirectory.po b/pureftpd/locale/it_IT/fusiondirectory.po
index 992c7cc509d950fc556253ad1dbb68244a7f7c7a..0a837071d9d7bc0b659907381badf536ba1dc759 100644
--- a/pureftpd/locale/it_IT/fusiondirectory.po
+++ b/pureftpd/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/pureftpd/locale/lv/fusiondirectory.po b/pureftpd/locale/lv/fusiondirectory.po
index bfbdfd26ac6e83ba3b5f77c43d345be58c064efa..e0195ee9d07410556c1706c5914d8f674c6d09a9 100644
--- a/pureftpd/locale/lv/fusiondirectory.po
+++ b/pureftpd/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/nb/fusiondirectory.po b/pureftpd/locale/nb/fusiondirectory.po
index 92c71b1adc85fb665b292ac11e744280305e7e3d..3d616c0f0a7d742473436fd1fca2ecad958f0bb3 100644
--- a/pureftpd/locale/nb/fusiondirectory.po
+++ b/pureftpd/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/nl/fusiondirectory.po b/pureftpd/locale/nl/fusiondirectory.po
index 6c19d42f74ac9dcad72446586cc92b79bd6f55cd..d16f6938957413a06451f7df7b2a31d1f06d749a 100644
--- a/pureftpd/locale/nl/fusiondirectory.po
+++ b/pureftpd/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/pureftpd/locale/pl/fusiondirectory.po b/pureftpd/locale/pl/fusiondirectory.po
index d6a3427420a4b70da2736b4a4dbeb5db9a21e181..41145c8b0dc4718fd71759fc0c6de76dd8502cdd 100644
--- a/pureftpd/locale/pl/fusiondirectory.po
+++ b/pureftpd/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:33
 msgid "Ftp"
diff --git a/pureftpd/locale/pt/fusiondirectory.po b/pureftpd/locale/pt/fusiondirectory.po
index ae6c6613940b07fe7ab11ecc9ff0f5293c80ff90..a10d928eef43cb756cc732cfa34ce7d6a7790faf 100644
--- a/pureftpd/locale/pt/fusiondirectory.po
+++ b/pureftpd/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/pt_BR/fusiondirectory.po b/pureftpd/locale/pt_BR/fusiondirectory.po
index 0278348bbe947e0a6120c836a8d72ffa5af14817..93271decdc7fa6acec015ab0194f2b55928801a7 100644
--- a/pureftpd/locale/pt_BR/fusiondirectory.po
+++ b/pureftpd/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/pureftpd/locale/ru/fusiondirectory.po b/pureftpd/locale/ru/fusiondirectory.po
index a5db1b9177c48d3eb6edaf00283146f588722060..0df85c3686bf0bfffe463d838636b06b14bd61e7 100644
--- a/pureftpd/locale/ru/fusiondirectory.po
+++ b/pureftpd/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/pureftpd/locale/ru@petr1708/fusiondirectory.po b/pureftpd/locale/ru@petr1708/fusiondirectory.po
index dfd3ed52ede18f16fc97d251bc6789b2445de061..a99af72af0956698a8450fd7509982aa2daa9aeb 100644
--- a/pureftpd/locale/ru@petr1708/fusiondirectory.po
+++ b/pureftpd/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/sv/fusiondirectory.po b/pureftpd/locale/sv/fusiondirectory.po
index ef5df3d303c5cc60814cd6c37ea1f45ed6298687..41a5631acda0756f8e491f5e146a7117db287d5a 100644
--- a/pureftpd/locale/sv/fusiondirectory.po
+++ b/pureftpd/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/pureftpd/locale/ug/fusiondirectory.po b/pureftpd/locale/ug/fusiondirectory.po
index 131caa2e0e1b23284698a36604f8a58b5990ebde..d5201de3741ef6aed75b3cfd49efa12dddd53a2d 100644
--- a/pureftpd/locale/ug/fusiondirectory.po
+++ b/pureftpd/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/vi_VN/fusiondirectory.po b/pureftpd/locale/vi_VN/fusiondirectory.po
index ed8338c8f98e5a7ecba4a7535760cd9cecc91f39..5b2b57f823625632598a68afc488b49ce3bfca61 100644
--- a/pureftpd/locale/vi_VN/fusiondirectory.po
+++ b/pureftpd/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/zh/fusiondirectory.po b/pureftpd/locale/zh/fusiondirectory.po
index eb13ad290590a612036dc5b644be6f633e05c339..8b8e3acf23c6fe4634ada77e4ee5c460d6362740 100644
--- a/pureftpd/locale/zh/fusiondirectory.po
+++ b/pureftpd/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/quota/locale/ar/fusiondirectory.po b/quota/locale/ar/fusiondirectory.po
index e2ef5c6ebb033dd83333c57942c96081c1767b2a..7bc17ea40ae8115ffdaa7e1fdaef46830e1e6345 100644
--- a/quota/locale/ar/fusiondirectory.po
+++ b/quota/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/quota/locale/ca/fusiondirectory.po b/quota/locale/ca/fusiondirectory.po
index c1fb274a948c8f9330e68294f19b6815440f0c19..1183ae3e60ecb86a6d54282bac78d14f68471a30 100644
--- a/quota/locale/ca/fusiondirectory.po
+++ b/quota/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/quota/locale/cs_CZ/fusiondirectory.po b/quota/locale/cs_CZ/fusiondirectory.po
index 9cab98088aa6dbed2f4040a680bdd19f89db34d7..549ea82909de5ec740b02f6aa245f3fb17911f78 100644
--- a/quota/locale/cs_CZ/fusiondirectory.po
+++ b/quota/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/quota/locale/de/fusiondirectory.po b/quota/locale/de/fusiondirectory.po
index c6088001386c80f0770a6aad313ca780c3c44681..0acc733f202370f7935c64f1740f8b710a87ad28 100644
--- a/quota/locale/de/fusiondirectory.po
+++ b/quota/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/quota/locale/el_GR/fusiondirectory.po b/quota/locale/el_GR/fusiondirectory.po
index af13377aed3049cfbcf74367e2062ce0ffe0b3f5..c26a47c311c43d5940c800770b34aa8c7a416c71 100644
--- a/quota/locale/el_GR/fusiondirectory.po
+++ b/quota/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/quota/locale/en/fusiondirectory.po b/quota/locale/en/fusiondirectory.po
index e1d483de0c25e67a03e3d820c583438f17e636d1..0bba4b1a89161774718671fea91753f3769b33cd 100644
--- a/quota/locale/en/fusiondirectory.po
+++ b/quota/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/quota/locale/es/fusiondirectory.po b/quota/locale/es/fusiondirectory.po
index 159a5a1c40980f14e7ee829515013eb11a13197e..a10ed3a2d1864745bb85c3283729b51b1cd0d8d7 100644
--- a/quota/locale/es/fusiondirectory.po
+++ b/quota/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/quota/locale/es_CO/fusiondirectory.po b/quota/locale/es_CO/fusiondirectory.po
index 9d21aa6a179562461ef56b3969505d8fba514c20..f751a46b3a1929a8a32c12ea0c994b7c19c94b83 100644
--- a/quota/locale/es_CO/fusiondirectory.po
+++ b/quota/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/quota/locale/es_VE/fusiondirectory.po b/quota/locale/es_VE/fusiondirectory.po
index dea69216bf32800a0d3d6627e6ebfcaa60c80cbf..1ac7a8ae80db3e76a18aeb367067e0c09ffa4a12 100644
--- a/quota/locale/es_VE/fusiondirectory.po
+++ b/quota/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/quota/locale/fa_IR/fusiondirectory.po b/quota/locale/fa_IR/fusiondirectory.po
index fc0fdab75e30cde1e3b1348250705e7a7a604bb7..dd18457a328a4214edfeb4d687b082942cd6b0f5 100644
--- a/quota/locale/fa_IR/fusiondirectory.po
+++ b/quota/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/fi_FI/fusiondirectory.po b/quota/locale/fi_FI/fusiondirectory.po
index e3687e9d3f2bb4769d768768c1d555be63f7f0c8..691e502554db931626fbb00a2fea5e90191449ac 100644
--- a/quota/locale/fi_FI/fusiondirectory.po
+++ b/quota/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/quota/locale/fr/fusiondirectory.po b/quota/locale/fr/fusiondirectory.po
index 3f3c1e07d39aa6161ab7514da68806f60dbdfc9b..4cfc4979d4c7e7cc0a42002064c8058f3ddaae61 100644
--- a/quota/locale/fr/fusiondirectory.po
+++ b/quota/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/quota/locale/hu_HU/fusiondirectory.po b/quota/locale/hu_HU/fusiondirectory.po
index ffbead5909d5b1946d720d30366d6bb2180216f2..68524f052eaa1a80c92a3211f42af39f16264df7 100644
--- a/quota/locale/hu_HU/fusiondirectory.po
+++ b/quota/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/id/fusiondirectory.po b/quota/locale/id/fusiondirectory.po
index 3c1e24865c7c3253a15916f164396304953e1f43..75523edae426146fac39b28b691363d1ee23b6a2 100644
--- a/quota/locale/id/fusiondirectory.po
+++ b/quota/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/it_IT/fusiondirectory.po b/quota/locale/it_IT/fusiondirectory.po
index ce472660bfd952a36869266893adbfb115423f71..993cabd48ca6dc6581939d1d7ed470ed2e521224 100644
--- a/quota/locale/it_IT/fusiondirectory.po
+++ b/quota/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/quota/locale/lv/fusiondirectory.po b/quota/locale/lv/fusiondirectory.po
index 0e852de5d644445572c2b69228969d7efabd70e6..e59ae21302aba0d208ca13efd3411ecfac7861d5 100644
--- a/quota/locale/lv/fusiondirectory.po
+++ b/quota/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/quota/locale/nb/fusiondirectory.po b/quota/locale/nb/fusiondirectory.po
index 76ba834e73b8f1b8da8fe720a3983abbd038f3ea..efcbd016e841a2a9bf94772637fb085927f3f4db 100644
--- a/quota/locale/nb/fusiondirectory.po
+++ b/quota/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/quota/locale/nl/fusiondirectory.po b/quota/locale/nl/fusiondirectory.po
index c2aeecffb0329a34d34c772fda59059d8903ca34..5f4bd8a1150d26f3ebe81022df97ad8256b86073 100644
--- a/quota/locale/nl/fusiondirectory.po
+++ b/quota/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/quota/locale/pl/fusiondirectory.po b/quota/locale/pl/fusiondirectory.po
index fdf21671fdf9c910101b776c20b2b1a033049ebb..8f7bf7e3268c9a786880e0665ed8f5f10f78f3bc 100644
--- a/quota/locale/pl/fusiondirectory.po
+++ b/quota/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/quota/class_quotaAccount.inc:101
 msgid "Quota"
diff --git a/quota/locale/pt/fusiondirectory.po b/quota/locale/pt/fusiondirectory.po
index 77a15d9d85fb99c141fc688da6062c2fa93b4321..4320aa2adb7a0ce0c70503268d246e8e10ba7d40 100644
--- a/quota/locale/pt/fusiondirectory.po
+++ b/quota/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/quota/locale/pt_BR/fusiondirectory.po b/quota/locale/pt_BR/fusiondirectory.po
index e84e3ea781d382904d00820a3d9cccd9ae2f15d3..4434eae4b0eec5c396c41c16aee33ea2aa239f17 100644
--- a/quota/locale/pt_BR/fusiondirectory.po
+++ b/quota/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/quota/locale/ru/fusiondirectory.po b/quota/locale/ru/fusiondirectory.po
index ac36b25c3170a0d3ab09e0e6c5aa23bff9acfa38..d79e135e106ab6ad651844c4cf81c63af65e2515 100644
--- a/quota/locale/ru/fusiondirectory.po
+++ b/quota/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/quota/locale/ru@petr1708/fusiondirectory.po b/quota/locale/ru@petr1708/fusiondirectory.po
index 55758a128a8b6b04cca70ab0cdf3a12e7d7cc9a1..862d5cf3f9fdb7c9d759ec56af4e124dfb596d4d 100644
--- a/quota/locale/ru@petr1708/fusiondirectory.po
+++ b/quota/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/sv/fusiondirectory.po b/quota/locale/sv/fusiondirectory.po
index 33ea3e638d869b93dcb05b6eb32dd9aa4edc3eaf..6217dba19bfe71d44a33b0123b1c723dcc8e61c6 100644
--- a/quota/locale/sv/fusiondirectory.po
+++ b/quota/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/quota/locale/ug/fusiondirectory.po b/quota/locale/ug/fusiondirectory.po
index 5811dab1856ae52ad787daeb981fa1c585916a4c..80ded4b4d49cf0d25ad99bafb3feb93def8bf523 100644
--- a/quota/locale/ug/fusiondirectory.po
+++ b/quota/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/vi_VN/fusiondirectory.po b/quota/locale/vi_VN/fusiondirectory.po
index cc77d70fe8dffa3528548cbc5495a037f64919bd..d994a4ddd24e0740b66af7ce4c5e7abe510f6638 100644
--- a/quota/locale/vi_VN/fusiondirectory.po
+++ b/quota/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/quota/locale/zh/fusiondirectory.po b/quota/locale/zh/fusiondirectory.po
index 3955aab87e2ab120eb1f2cc219218c0f35c027cc..d7a6b1dfab3656c6b8465eb3b6fe31308f3a1b6f 100644
--- a/quota/locale/zh/fusiondirectory.po
+++ b/quota/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/renater-partage/admin/groups/renater-partage/class_partageGroup.inc b/renater-partage/admin/groups/renater-partage/class_partageGroup.inc
new file mode 100644
index 0000000000000000000000000000000000000000..516982a6f0f3b9f692bfc04797014d76e90777e7
--- /dev/null
+++ b/renater-partage/admin/groups/renater-partage/class_partageGroup.inc
@@ -0,0 +1,71 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2017 FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+class partageGroup extends simplePlugin
+{
+  var $displayHeader  = TRUE;
+  var $objectclasses  = array('fdRenaterPartageGroup');
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'    => _('Partage'),
+      'plDescription'  => _('Partage group options'),
+      'plDepends'      => array('mailGroup'),
+      'plObjectType'   => array('group', 'ogroup-user'),
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('Information'),
+        'attrs' => array(
+          new StringAttribute (
+            _('Display name'), _('Name to display for this group'),
+            'displayName'
+          ),
+          new BooleanAttribute (
+            _('Hide from global catalog'), _('Whether this group should be hidden from the global catalog'),
+            'fdRenaterPartageGroupHideInGal', FALSE,
+            FALSE
+          ),
+          new SelectAttribute (
+            _('Type'), _('Type of PARTAGE group'),
+            'fdRenaterPartageGroupMailStatus', TRUE,
+            array('enabled','disabled'), 'enabled',
+            array(_('Distribution list'), _('Group'))
+          ),
+          new BooleanAttribute (
+            _('Alert new members'), _('Send a message to alert new members, they have joined this group'),
+            'fdRenaterPartageGroupSendShareMessageToNewMembers', FALSE,
+            TRUE
+          ),
+          new TextAreaAttribute (
+            _('Notes'), _('Notes about this group'),
+            'fdRenaterPartageGroupNotes', FALSE
+          ),
+        )
+      )
+    );
+  }
+}
diff --git a/renater-partage/admin/sympa/renater-partage/class_sympaAliasPartage.inc b/renater-partage/admin/sympa/renater-partage/class_sympaAliasPartage.inc
new file mode 100644
index 0000000000000000000000000000000000000000..5249dccc68a2c1bec4d4afac33d30f49c4ee6918
--- /dev/null
+++ b/renater-partage/admin/sympa/renater-partage/class_sympaAliasPartage.inc
@@ -0,0 +1,194 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2017 FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+class sympaAliasPartage extends simplePlugin
+{
+  var $displayHeader  = TRUE;
+  var $objectclasses  = array('fdRenaterPartageSympaAlias');
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'    => _('Partage'),
+      'plDescription'  => _('Partage sympa options'),
+      'plObjectType'   => array('sympaAlias'),
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('Information'),
+        'attrs' => array(
+          new SelectAttribute(
+            _('Server'), _('Email server'),
+            'gosaMailServer', TRUE,
+            array('')
+          ),
+          new StringAttribute (
+            _('Display name'), _('Name to display for this group'),
+            'displayName'
+          ),
+          new BooleanAttribute (
+            _('Hide from global catalog'), _('Whether this group should be hidden from the global catalog'),
+            'fdRenaterPartageGroupHideInGal', FALSE,
+            FALSE
+          ),
+          new HiddenAttribute (
+            'fdRenaterPartageGroupMailStatus', TRUE, 'enabled'
+          ),
+          new BooleanAttribute (
+            'fdRenaterPartageGroupSendShareMessageToNewMembers', '',
+            'fdRenaterPartageGroupSendShareMessageToNewMembers', FALSE,
+            FALSE
+          ),
+          new TextAreaAttribute (
+            _('Notes'), _('Notes about this group'),
+            'fdRenaterPartageGroupNotes', FALSE
+          ),
+          new SetAttribute (
+            new StringAttribute (
+              _('Alternative addresses'), _('Alternative mail addresses for the list'),
+              'gosaMailAlternateAddress'
+            )
+          ),
+        )
+      )
+    );
+  }
+
+  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
+  {
+    parent::__construct($dn, $object, $parent, $mainTab);
+
+    $this->attributesAccess['fdRenaterPartageGroupSendShareMessageToNewMembers']->setVisible(FALSE);
+    $this->attributesAccess['gosaMailServer']->setChoices(array_keys(mailMethodRenaterPartage::get_server_list()));
+    $this->attributesAccess['gosaMailServer']->setSubmitForm('mailServerChanged');
+    $this->mailServerChanged();
+  }
+
+  /* We need $mailAccount->cn to return the cn for mailMethod */
+  public function __get($name)
+  {
+    if (($name == 'cn') && isset($this->parent)) {
+      return $this->parent->getBaseObject()->$name;
+    } elseif (($name == 'mail') && isset($this->parent)) {
+      return $this->parent->getBaseObject()->cn.'@'.$this->getEmailDomain();
+    } else {
+      /* Calling default behaviour */
+      return parent::__get($name);
+    }
+  }
+
+  public function __isset($name)
+  {
+    if (($name == 'cn') && isset($this->parent)) {
+      return isset($this->parent->getBaseObject()->$name);
+    } elseif (($name == 'mail') && isset($this->parent)) {
+      return isset($this->parent->getBaseObject()->cn);
+    } else {
+      /* Calling default behaviour */
+      return parent::__isset($name);
+    }
+  }
+
+  private function getEmailDomain()
+  {
+    $servers  = mailMethod::getMailServers();
+    $infos    = $servers[$this->gosaMailServer];
+    if (isset($infos['domain'])) {
+      return $infos['domain'];
+    } else {
+      return '';
+    }
+  }
+
+  public function mailServerChanged()
+  {
+    /* Intialize the used mailMethod */
+    if ($this->gosaMailServer == '') {
+      $method = 'mailMethod';
+    } else {
+      $method = mailMethod::getServerMethod($this->gosaMailServer);
+    }
+    $this->mailMethod = mailMethod::getInstance($method, $this, 'sympaAlias');
+    $this->mailMethod->fixAttributesOnLoad();
+  }
+
+  protected function shouldSave()
+  {
+    /* mail method might have something to save */
+    return TRUE;
+  }
+
+  public function ldap_save()
+  {
+    if (!empty($this->attrs)) {
+      $errors = parent::ldap_save();
+      if (!empty($errors)) {
+        return $errors;
+      }
+    }
+
+    $errors = array();
+
+    /* Only do IMAP actions if we are not a template */
+    if (!$this->is_template) {
+      $this->mailMethod->connect();
+      if (!$this->mailMethod->is_connected()) {
+        $errors[] = sprintf(_('Mail method cannot connect: %s'), $this->mailMethod->get_error());
+      } else {
+        if (!$this->mailMethod->updateMailbox()) {
+          $errors[] = sprintf(_('Cannot update mailbox: %s'), $this->mailMethod->get_error());
+        }
+      }
+    }
+    $this->mailMethod->disconnect();
+
+    if (!empty($errors) && !$this->initially_was_account) {
+      /* Mail method failed to create, cancel ldap save */
+      $this->prepareNextCleanup();
+      $this->prepare_remove();
+      $this->ldap_remove();
+    }
+
+    return $errors;
+  }
+
+  function post_remove()
+  {
+    /* Let the mailMethod remove this mailbox */
+    if (!$this->is_template) {
+      if (!$this->mailMethod->connect()) {
+        msg_dialog::display(_('Mail error'), sprintf(_('Cannot remove mailbox, mail method cannot connect: %s'),
+              $this->mailMethod->get_error()), ERROR_DIALOG);
+      } else {
+        if (!$this->mailMethod->deleteMailbox()) {
+          msg_dialog::display(_('Mail error'), sprintf(_('Cannot remove mailbox: %s'),
+                $this->mailMethod->get_error()), ERROR_DIALOG);
+        }
+      }
+    }
+    $this->mailMethod->disconnect();
+    parent::post_remove();
+  }
+}
diff --git a/renater-partage/contrib/openldap/renater-partage-fd.schema b/renater-partage/contrib/openldap/renater-partage-fd.schema
index 54bd09d116c4c725404c7dc50bc744423209e98e..a2ecd79c735d7ce4041a3c7c035926d1c1887883 100644
--- a/renater-partage/contrib/openldap/renater-partage-fd.schema
+++ b/renater-partage/contrib/openldap/renater-partage-fd.schema
@@ -26,8 +26,48 @@ attributetype ( 1.3.6.1.4.1.38414.63.1.4 NAME 'fdRenaterPartageServerDeletionTyp
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
+attributetype ( 1.3.6.1.4.1.38414.63.11.1 NAME 'fdRenaterPartageGroupHideInGal'
+  DESC 'FusionDirectory - Hide Renater PARTAGE group from global catalog'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.38414.63.11.2 NAME 'fdRenaterPartageGroupMailStatus'
+  DESC 'FusionDirectory - enabled or disabled'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
+attributetype ( 1.3.6.1.4.1.38414.63.11.3 NAME 'fdRenaterPartageGroupSendShareMessageToNewMembers'
+  DESC 'FusionDirectory - Send share message to new Renater PARTAGE group members'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.38414.63.11.4 NAME 'fdRenaterPartageGroupNotes'
+  DESC 'FusionDirectory - Notes about the group'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE)
+
 # Objectclasses
 objectclass (1.3.6.1.4.1.38414.63.2.1 NAME 'fdRenaterPartageServer' SUP top AUXILIARY
   DESC 'FusionDirectory - Renater Partage server description'
   MUST ( cn $ fdRenaterPartageServerUri $ fdRenaterPartageServerUserAgent )
   MAY  ( fdRenaterPartageServerMailDomain $ fdRenaterPartageServerDeletionType ))
+
+objectclass (1.3.6.1.4.1.38414.63.2.2 NAME 'fdRenaterPartageGroup' SUP top AUXILIARY
+  DESC 'FusionDirectory - Renater Partage group'
+  MUST ( )
+  MAY  ( displayName $ fdRenaterPartageGroupHideInGal $ fdRenaterPartageGroupMailStatus
+  $ fdRenaterPartageGroupSendShareMessageToNewMembers $ fdRenaterPartageGroupNotes ))
+
+objectclass (1.3.6.1.4.1.38414.63.2.3 NAME 'fdRenaterPartageSympaAlias' SUP top AUXILIARY
+  DESC 'FusionDirectory - Renater Partage group'
+  MUST ( gosaMailServer )
+  MAY  ( displayName $ fdRenaterPartageGroupHideInGal $ fdRenaterPartageGroupMailStatus
+  $ fdRenaterPartageGroupSendShareMessageToNewMembers $ fdRenaterPartageGroupNotes
+  $ gosaMailAlternateAddress ))
+
diff --git a/renater-partage/locale/ar/fusiondirectory.po b/renater-partage/locale/ar/fusiondirectory.po
index babba11d1cca267c418a68dafc94c1103f90193e..53a525ecc2506292725372f09a10bc3225ab20d8 100644
--- a/renater-partage/locale/ar/fusiondirectory.po
+++ b/renater-partage/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "تحذير"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "معلومات"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "خادم"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "النوع"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "مجموعة"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/ca/fusiondirectory.po b/renater-partage/locale/ca/fusiondirectory.po
index 8b7a87bf447a32eeff4bde38ea0caa88363e9943..6b90373785d7b18e9d4dfc03c3c752d02ed0d804 100644
--- a/renater-partage/locale/ca/fusiondirectory.po
+++ b/renater-partage/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Avís"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Informació"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/cs_CZ/fusiondirectory.po b/renater-partage/locale/cs_CZ/fusiondirectory.po
index 19cc0899a6d23d4412a1b93f7376f9f660b009dc..aa7b32f371c2d05c80213494076c3f0808732a9d 100644
--- a/renater-partage/locale/cs_CZ/fusiondirectory.po
+++ b/renater-partage/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "varování"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr "Nikdy"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr "Stav účtu"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "neznámé"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "informace"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "server"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "zobrazované jméno"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "poznámky"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "alternativní adresy"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "E-mailová metodou se nelze připojit: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Nezdařilo se aktualizovat schránku: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "chyba e-mailu"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr "E-mailovou schránku se nedaří odebrat, nedaří se připojit metodou: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Nelze odebrat schárnku: %s"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "typ"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "skupina"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/de/fusiondirectory.po b/renater-partage/locale/de/fusiondirectory.po
index 988f26fcafe9a59e89884c11a5d67cbf0a8a30f3..444ee570b76c6137780b5f0bdad8dfbd550b28ac 100644
--- a/renater-partage/locale/de/fusiondirectory.po
+++ b/renater-partage/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Warnung"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr "Nie"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Unbekannt"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Information"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Server"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Anzeigename"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "Notizen"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Alternative Adressen"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "Mail-Methode kann nicht verbinden: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Kann das Postfach nicht aktualisieren: '%s'"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "Mail-Fehler"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Kann das Postfach nicht entfernen: %s"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Typ"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Gruppe"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/el_GR/fusiondirectory.po b/renater-partage/locale/el_GR/fusiondirectory.po
index 07dfe9bc436685bc15718cd0c47a3707414f61fb..21c6ebc926778e25475ed6ce81fa55c1b4b073fc 100644
--- a/renater-partage/locale/el_GR/fusiondirectory.po
+++ b/renater-partage/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr "Ποτέ"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Άγνωστο"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Πληροφορίες"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Εξυπηρετητής"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Όνομα που εμφανίζεται"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "Σημειώσεις"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Εναλλακτικές διευθύνσεις"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "Σφάλμα αλληλογραφίας"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Αδυναμία διαγραφής γραμματοκιβωτίου: %s"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Τύπος"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Ομάδα"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/en/fusiondirectory.po b/renater-partage/locale/en/fusiondirectory.po
index 80cc7ad7246ba9d5ecb40604721e854591d643b0..ada964e61d36c93c809fff399fde826ce494f0bd 100644
--- a/renater-partage/locale/en/fusiondirectory.po
+++ b/renater-partage/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,69 +17,191 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/es/fusiondirectory.po b/renater-partage/locale/es/fusiondirectory.po
index 995d2853a763578dc33c22af9428b49efbea927d..51716964c8a1498f4c6224386a9406a48f2e7dda 100644
--- a/renater-partage/locale/es/fusiondirectory.po
+++ b/renater-partage/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Desconocido"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Información"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Servidor"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Nombre a Mostrar"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "Notas"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Direcciones alternativas"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "El método de correo no puede conectar: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "No puedo actualizar el buzón de correo: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "Error de correo"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Tipo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Grupo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/es_CO/fusiondirectory.po b/renater-partage/locale/es_CO/fusiondirectory.po
index 0256ebb108b5a80a58229721af183c6961af1c0d..2e498abd4d8b41e164a1ed2e0277075fad5d0044 100644
--- a/renater-partage/locale/es_CO/fusiondirectory.po
+++ b/renater-partage/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Precacuión"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Desconocido"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Información"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Tipo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "GRupo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/es_VE/fusiondirectory.po b/renater-partage/locale/es_VE/fusiondirectory.po
index ec1896073255edb172a540d67f2dbfb569b4a387..6412980283011d85f022a137dd9f4e09c4f37910 100644
--- a/renater-partage/locale/es_VE/fusiondirectory.po
+++ b/renater-partage/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Desconocido"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Información"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Servidor"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Nombre a Mostrar"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "Notas"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Direcciones alternativas"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "El método de correo no puede conectar: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "No puedo actualizar el buzón de correo: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "Error de correo"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "No se puede eliminar el buzón: %s"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Tipo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Grupo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/fa_IR/fusiondirectory.po b/renater-partage/locale/fa_IR/fusiondirectory.po
index f591d0da6b159cf14a0b14b9b7997dea3bb2ec48..f22b77b56ca81b3bc35a7fa638a7006d6f89d385 100644
--- a/renater-partage/locale/fa_IR/fusiondirectory.po
+++ b/renater-partage/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,69 +17,191 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/fi_FI/fusiondirectory.po b/renater-partage/locale/fi_FI/fusiondirectory.po
index aae6e846a3388aaeaddfc0ff5942e66cba073efd..b3e1d15de7aa033c7a27ba02351e23dfc833a58b 100644
--- a/renater-partage/locale/fi_FI/fusiondirectory.po
+++ b/renater-partage/locale/fi_FI/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Dina Solveig Jalkanen <dinsteri@gmail.com>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Varoitus"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Tyyppi"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/fr/fusiondirectory.po b/renater-partage/locale/fr/fusiondirectory.po
index bf8234095c8d56fe763cb5bb72f8bc4fbadfd115..ea33440a479a27e0473a680474371bee70fb3a03 100644
--- a/renater-partage/locale/fr/fusiondirectory.po
+++ b/renater-partage/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr "Le serveur n'a pas retourné le jeton d'authentification"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr "Partage API réponse mal formée"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr "Partage API Auth a échoué: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr "Partage API Auth a échoué sans message d'erreur"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr "Impossible de se connecter à %s: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr "Impossible de se connecter à %s"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Avertissement"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
@@ -58,31 +58,157 @@ msgstr ""
 "Plusieurs adresses ont été fournies dans gosaMailForwardingAddress, mais une"
 " seule est prise en charge par PARTAGE. %s sera envoyé à PARTAGE."
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr "Erreur PARTAGE"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr "Plusieurs utilisateurs ont l'uid \"%s\". j'ignore ce membre."
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr "Un compte avec la même adresse de messagerie existe déjà dans Partage"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr "Valeur non valide dans fdRenaterPartageServerDeletionType"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr "Jamais"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr "Statut du compte"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Inconnu"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr "Partage"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr "Options sympa de Renater Partage"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Information"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Serveur"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr "Serveur de messagerie"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Nom à afficher"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr "Nom à afficher pour ce groupe"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr "Masquer du catalogue global"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr "Est ce que ce groupe doit être caché dans le catalogue global"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "Notes"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr "Notes sur ce groupe"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Adresses alternatives"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr "Adresses de courriel alternatives pour la liste"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "Le méthode de courriel ne peut pas se connecter : %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Impossible de mettre à jour le compte : %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "Erreur du serveur de courriel"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+"Impossible de supprimer le compte de messagerie, impossible de se connecter "
+"à : %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Impossible de supprimer le compte de messagerie : %s"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr "Options de groupe de Renater Partage"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Type"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr "Type de groupe PARTAGE"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr "Liste de distribution"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Groupes"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr "Prévenir les nouveaux membres"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+"Envoyer un message pour prévenir les nouveaux membres, ils ont rejoint ce "
+"groupe"
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/hu_HU/fusiondirectory.po b/renater-partage/locale/hu_HU/fusiondirectory.po
index 11d16d0b75bdd16516fc147362f436dd43753d7f..1fe6018c35b8cf9832aa80b3d062c670ac249df3 100644
--- a/renater-partage/locale/hu_HU/fusiondirectory.po
+++ b/renater-partage/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,69 +17,191 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/id/fusiondirectory.po b/renater-partage/locale/id/fusiondirectory.po
index 30d592a4b53445900742369c52a2c2314d95eea2..e09da9d5e26d20b78c941c75c25a31fd657ce12f 100644
--- a/renater-partage/locale/id/fusiondirectory.po
+++ b/renater-partage/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,69 +17,191 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/it_IT/fusiondirectory.po b/renater-partage/locale/it_IT/fusiondirectory.po
index c69d064db9c444cf5495d17b095bb03b44e396f5..f99d5c39104de03eb9986ebf8ae6b3fe6a45ec62 100644
--- a/renater-partage/locale/it_IT/fusiondirectory.po
+++ b/renater-partage/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr "Il server non ha restituito il token di auth"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr "La risposta API di Partage é malformata"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr "L'auth dell'API di Partage non é riuscita: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr "L'Auth dell'API Partage non è riuscita con nessun messaggio di errore"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr "Impossible connettersi a %s: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr "Impossibile connettersi a %s"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
@@ -58,31 +58,157 @@ msgstr ""
 "Diversi indirizzi sono stati dati in gosaMailForwardingAddress ma solo uno è"
 " supportato da PARTAGE. %s verrà inviato a PARTAGE."
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr "Errore PARTAGE"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr "Diversi utenti hanno uid \"%s\". Ignorare questo membro."
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr "Un account con lo stesso indirizzo e-mail esiste già in Partage"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr "Valore non valido in fdRenaterPartageServerDeletionType"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr "Mai"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr "Stato dell'account"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Sconosciuto"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr "Partage"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr "Opzioni sympa di Partage"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Informazione"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Server"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr "Server di posta elettronica "
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Mostra il nome"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr "Nome da visualizzare per questo gruppo"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr "Nascondi dal catalogo globale"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr "Sia che questo gruppo sia nascosto dal catalogo globale"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "Note"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr "Note su questo gruppo"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Indirizzi alternativi"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr "Indirizzo mail alternativo per la lista"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "L'algoritmo di posta elettronica non riesce a connettersi : %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Impossibile aggiornare l'account : %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "Errore del server di posta elettronica"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+"Impossibile rimuovere la mailbox, il metodo di posta non riesce a "
+"connettersi a: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Impossibile rimuovere mailbox : %s"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr "Opzioni del gruppo Partage"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Tipo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr "Tipo di gruppo PARTAGE"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr "Lista di distribuzione"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Gruppo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr "Avvisare nuovi membri"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+"Invia un messaggio per avvisare i nuovi membri che hanno aderito a questo "
+"gruppo"
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/lv/fusiondirectory.po b/renater-partage/locale/lv/fusiondirectory.po
index 1c7b2faade4f09496bc795e199ad70abc39636c7..2cd1d7fcf28b42ddf535ed36b01551be3bfe23c3 100644
--- a/renater-partage/locale/lv/fusiondirectory.po
+++ b/renater-partage/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Informācija"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Veids"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/nb/fusiondirectory.po b/renater-partage/locale/nb/fusiondirectory.po
index 1a1b62cf7c2f95bd808ae676227a983fc39b48ea..d4733309ef8fadfabed0e8ef3a37e7fa7c53f423 100644
--- a/renater-partage/locale/nb/fusiondirectory.po
+++ b/renater-partage/locale/nb/fusiondirectory.po
@@ -8,8 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,69 +18,191 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Tjener"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/nl/fusiondirectory.po b/renater-partage/locale/nl/fusiondirectory.po
index 57d08d28383e2edb46aba85e0026d47b1244b283..ec73ec47a10fc212b231aad3753614d3c7c20cfe 100644
--- a/renater-partage/locale/nl/fusiondirectory.po
+++ b/renater-partage/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr "Kan niet connecteren met %s"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr "Nooit"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Onbekend"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Informatie"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Server"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Getoonde naam"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "Notas"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Alternatieve adressen"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "Mail methode kan niet verbinden : %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Kan mailbox : %s niet updaten"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "Mail fout"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Kan mailbox niet verwijderen : %s"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Type"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Groep"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/pl/fusiondirectory.po b/renater-partage/locale/pl/fusiondirectory.po
index 4d33016da4ca54f5f4f02921ae8d326fd60d303a..444b6eebece7ef3b99143f9bc124a265bb591d3e 100644
--- a/renater-partage/locale/pl/fusiondirectory.po
+++ b/renater-partage/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,71 +16,193 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Nieznane"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Informacja"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Serwer"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Wyświetl nazwę"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Adresy alternatywne"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Typ"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Grupa"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/pt/fusiondirectory.po b/renater-partage/locale/pt/fusiondirectory.po
index 4e3fc8580e773dffbb440cf9341f78b3bb197909..f80f62d01310bdb0e25adb1477105dd37e44188f 100644
--- a/renater-partage/locale/pt/fusiondirectory.po
+++ b/renater-partage/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Atenção"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Desconhecido"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Informação"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Servidor"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Tipo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/pt_BR/fusiondirectory.po b/renater-partage/locale/pt_BR/fusiondirectory.po
index e7bbf7ec0f1ba647c5058fa671a348c1f143aca2..36512403c8d2eb2f00f6204d3a75575ea1f047d7 100644
--- a/renater-partage/locale/pt_BR/fusiondirectory.po
+++ b/renater-partage/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Desconhecido"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Informação"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "servidor"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Nome de exibição"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr "Notas"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Endereços alternativos"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "Não foi possível conectar com este método de correio: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Não é possível atualizar caixa de correio: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr "Erro de correio"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Tipo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Grupo"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/ru/fusiondirectory.po b/renater-partage/locale/ru/fusiondirectory.po
index 586ae32f62c4bbb7fad7c2b93e44197dae94ddfb..98843eb0c7d456a97700017d8d8432d1a955b3f4 100644
--- a/renater-partage/locale/ru/fusiondirectory.po
+++ b/renater-partage/locale/ru/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Alexey Matveev <Tippet@yandex.ru>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Неизвестно"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Информация"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Сервер"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "Отображаемое имя"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "Альтернативные адреса"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Не могу обновить почтовый ящик: %s"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Не могу удалить почтовый ящик: \"%s\""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Тип"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Группа"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/ru@petr1708/fusiondirectory.po b/renater-partage/locale/ru@petr1708/fusiondirectory.po
index f1687c99d1b570711f9f0954954893b88f438912..9e7a9a15c738fc15bbabcbc6a7443ac685af623d 100644
--- a/renater-partage/locale/ru@petr1708/fusiondirectory.po
+++ b/renater-partage/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -17,69 +17,191 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/sv/fusiondirectory.po b/renater-partage/locale/sv/fusiondirectory.po
index 056be61d42cb931bdf5e218217af0ba1af8bcc02..f77b73085db8a3b8e86d08610f81d812d51e990b 100644
--- a/renater-partage/locale/sv/fusiondirectory.po
+++ b/renater-partage/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Varning"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Okänd"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Information"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Server"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Typ"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Grupp"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/ug/fusiondirectory.po b/renater-partage/locale/ug/fusiondirectory.po
index a5d924b0948068551f184c4486b02aafe64c5871..7cec76a23bd8e5995a0174a3668966c5b1e26169 100644
--- a/renater-partage/locale/ug/fusiondirectory.po
+++ b/renater-partage/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -17,69 +17,191 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr ""
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/vi_VN/fusiondirectory.po b/renater-partage/locale/vi_VN/fusiondirectory.po
index dea208f70ff4eb865b7f256aad5487402ebbeb56..9f991febc6d581b3c213172d69ebf12866657eee 100644
--- a/renater-partage/locale/vi_VN/fusiondirectory.po
+++ b/renater-partage/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "Không rõ"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "Thông tin"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "Máy chủ (server)"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "Loại"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "Nhóm "
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/locale/zh/fusiondirectory.po b/renater-partage/locale/zh/fusiondirectory.po
index 82dae8e3ea9e1494e8cc2916378985a0cbc24142..aabe4f08c349165984b5158cb2742e315805546c 100644
--- a/renater-partage/locale/zh/fusiondirectory.po
+++ b/renater-partage/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -18,69 +18,191 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
 msgid "Server did not return auth token"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:114
 msgid "Partage API answer malformated"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:118
 #, php-format
 msgid "Partage API Auth failed: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:120
 msgid "Partage API Auth failed with no error message"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:129
 #, php-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:131
 #, php-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 msgid "Warning"
 msgstr "警告"
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:226
 #, php-format
 msgid ""
 "Several addresses were given in gosaMailForwardingAddress but only one is "
 "supported by PARTAGE. %s will be sent to PARTAGE."
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:458
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:459
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:498
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:511
 msgid "An account with the same email address already exists in Partage"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:576
 msgid "Invalid value in fdRenaterPartageServerDeletionType"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:432
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:613
 msgid "Never"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:620
 msgid "Last login"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Account status"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:440
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:621
 msgid "Unknown"
 msgstr "未知"
 
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+msgid "Information"
+msgstr "提示信息"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr "服务器"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Display name"
+msgstr "显示名称"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+msgid "Notes about this group"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr "替代地址"
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr "类型"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr "组"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
 #: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
 msgid "Renater Partage"
diff --git a/renater-partage/personal/mail/mail-methods/class_mail-methods-renater-partage.inc b/renater-partage/personal/mail/mail-methods/class_mail-methods-renater-partage.inc
index 5b6d9d9d4ac4f60b29b49ae4316292cb19b4654c..07957fd9693d3cc2e2908f72f2ed5e33bb1afc2e 100644
--- a/renater-partage/personal/mail/mail-methods/class_mail-methods-renater-partage.inc
+++ b/renater-partage/personal/mail/mail-methods/class_mail-methods-renater-partage.inc
@@ -24,7 +24,8 @@ class mailMethodRenaterPartage extends mailMethod
   protected $enableVacation         = FALSE;
   protected $enableFolderTypes      = FALSE;
 
-  protected $user_id = '%MAIL%';
+  protected $user_id  = '%MAIL%';
+  protected $share_id = '%MAIL%';
 
   private $http_options = array();
   private $ssl_options = array();
@@ -74,6 +75,8 @@ class mailMethodRenaterPartage extends mailMethod
 
     if (is_array($post)) {
       $post = http_build_query($post);
+      /* PARTAGE API does not support array[0]= syntax, it wants array[]= */
+      $post = preg_replace('/%5B[0-9]+%5D/simU', '%5B%5D', $post);
     }
 
     @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $command, '<b>MAIL: Command</b>');
@@ -165,73 +168,135 @@ class mailMethodRenaterPartage extends mailMethod
     } elseif (isset($this->cachedAccount['account']) && ($this->account_id == $this->cachedAccount['id'])) {
       return TRUE;
     }
-    $answer = $this->query('GetAccount', array('name' => $this->account_id));
-    if (($answer !== FALSE) && isset($answer['Response']['account'])) {
+    if ($this->type == 'user') {
+      $command    = 'GetAccount';
+      $answerkey  = 'account';
+    } else {
+      $command    = 'GetGroup';
+      $answerkey  = 'group';
+    }
+    $answer = $this->query($command, array('name' => $this->account_id));
+    if (($answer !== FALSE) && isset($answer['Response'][$answerkey])) {
       $this->cachedAccount = array(
-        'account' => $answer['Response']['account'],
+        'account' => $answer['Response'][$answerkey],
         'id'      => $this->account_id,
         'time'    => time()
       );
+      $this->cleanCachedAccountArrays();
       return TRUE;
     } else {
       return FALSE;
     }
   }
 
+  /*
+   * PARTAGE API returns weird stuff like:
+   * [members] => Array ( member => Array ( user1, user2 ) )
+   * or:
+   * [members] => Array ( member => user1 )
+   * We want:
+   * [members] => Array ( user1, user2 )
+   * */
+  private function cleanCachedAccountArrays()
+  {
+    $keys = array('members', 'zimbraMailAlias', 'zimbraAllowFromAddress');
+    foreach ($keys as $key) {
+      if (isset($this->cachedAccount['account'][$key])) {
+        $this->cachedAccount['account'][$key] = array_values($this->cachedAccount['account'][$key]);
+        if (isset($this->cachedAccount['account'][$key][0]) && is_array($this->cachedAccount['account'][$key][0])) {
+          $this->cachedAccount['account'][$key] = $this->cachedAccount['account'][$key][0];
+        }
+      }
+    }
+  }
+
   private function getAccountArray($infos)
   {
     $account = array(
       'name'                                => $this->account_id,
-      'zimbraCOSId'                         => $infos['cos_id'],
-      'zimbraMailQuota'                     => $this->parent->gosaMailQuota * 1024 * 1024,
-      'zimbraPrefMailLocalDeliveryDisabled' => ($this->parent->flag_ownmailbox ? 'TRUE' : 'FALSE'),
     );
-    if (!empty($this->parent->gosaMailForwardingAddress)) {
-      $count = count($this->parent->gosaMailForwardingAddress);
-      $address = $this->parent->gosaMailForwardingAddress[0];
-      if ($count > 1) {
-        msg_dialog::display(_('Warning'), sprintf(_('Several addresses were given in gosaMailForwardingAddress but only one is supported by PARTAGE. %s will be sent to PARTAGE.'), $address));
+    if ($this->type == 'user') {
+      $account['zimbraCOSId']                         = $infos['cos_id'];
+      $account['zimbraMailQuota']                     = $this->parent->gosaMailQuota * 1024 * 1024;
+      $account['zimbraPrefMailLocalDeliveryDisabled'] = ($this->parent->flag_ownmailbox ? 'TRUE' : 'FALSE');
+      if (!empty($this->parent->gosaMailForwardingAddress)) {
+        $count = count($this->parent->gosaMailForwardingAddress);
+        $address = $this->parent->gosaMailForwardingAddress[0];
+        if ($count > 1) {
+          msg_dialog::display(_('Warning'), sprintf(_('Several addresses were given in gosaMailForwardingAddress but only one is supported by PARTAGE. %s will be sent to PARTAGE.'), $address));
+        }
+        $account['zimbraPrefMailForwardingAddress'] = $address;
       }
-      $account['zimbraPrefMailForwardingAddress'] = $address;
     }
 
-    $userFields = array(
-      'sn', 'givenName', 'description',
-      'l', 'st',
-      'telephoneNumber', 'mobile', 'pager', 'facsimileTelephoneNumber',
-      'displayName', 'homePhone',
-      'title', 'ou',
-      'street', 'postalCode', 'postOfficeBox'
-    );
-    $userTab = $this->parent->parent->getBaseObject();
-    foreach ($userFields as $field) {
-      if (isset($userTab->$field)) {
-        $account[$field] = $userTab->$field;
-      }
+    if ($this->type == 'user') {
+      $mainFields = array(
+        'sn', 'givenName', 'description',
+        'l', 'st',
+        'telephoneNumber', 'mobile', 'pager', 'facsimileTelephoneNumber',
+        'displayName', 'homePhone',
+        'title', 'ou',
+        'street', 'postalCode', 'postOfficeBox'
+      );
+    } else {
+      $mainFields = array(
+        'description'
+      );
     }
-    $userMatchingFields = array(
-      'o' => 'company',
-      'roomNumber' => 'physicalDeliveryOfficeName'
-    );
-    foreach ($userMatchingFields as $fdField => $partageField) {
-      if (isset($userTab->$fdField)) {
-        $account[$partageField] = $userTab->$fdField;
+    $mainTab = $this->parent->parent->getBaseObject();
+    foreach ($mainFields as $field) {
+      if (isset($mainTab->$field)) {
+        $account[$field] = $mainTab->$field;
       }
     }
-    $account['zimbraAccountStatus'] = ($userTab->attributesAccess['userPassword']->isLocked() ? 'locked' : 'active');
-    $account['initials'] = strtoupper(substr($userTab->givenName, 0, 1).substr($userTab->sn, 0, 1));
 
-    /* Sync fields from SUPANN if tab is active */
-    if (isset($this->parent->parent->by_object['supannAccount']) && $this->parent->parent->by_object['supannAccount']->is_account) {
-      $supannTab = $this->parent->parent->by_object['supannAccount'];
-      $account['carLicense']      = $supannTab->eduPersonPrincipalName;
-      $account['zimbraHideInGal'] = ($supannTab->supannListeRouge ? 'TRUE' : 'FALSE');
-    }
+    if ($this->type == 'user') {
+      $userMatchingFields = array(
+        'o' => 'company',
+        'roomNumber' => 'physicalDeliveryOfficeName'
+      );
+      foreach ($userMatchingFields as $fdField => $partageField) {
+        if (isset($mainTab->$fdField)) {
+          $account[$partageField] = $mainTab->$fdField;
+        }
+      }
+      $account['zimbraAccountStatus'] = ($mainTab->attributesAccess['userPassword']->isLocked() ? 'locked' : 'active');
+      $account['initials'] = strtoupper(substr($mainTab->givenName, 0, 1).substr($mainTab->sn, 0, 1));
 
-    /* Sync fields from personal if tab is active */
-    if (isset($this->parent->parent->by_object['personalInfo']) && $this->parent->parent->by_object['personalInfo']->is_account) {
-      $personalTab    = $this->parent->parent->by_object['personalInfo'];
-      $account['co']  = $personalTab->co;
+      /* Sync fields from SUPANN if tab is active */
+      if (isset($this->parent->parent->by_object['supannAccount']) && $this->parent->parent->by_object['supannAccount']->is_account) {
+        $supannTab = $this->parent->parent->by_object['supannAccount'];
+
+        $account['carLicense']      = $supannTab->eduPersonPrincipalName;
+        $account['zimbraHideInGal'] = ($supannTab->supannListeRouge ? 'TRUE' : 'FALSE');
+      }
+
+      /* Sync fields from personal if tab is active */
+      if (isset($this->parent->parent->by_object['personalInfo']) && $this->parent->parent->by_object['personalInfo']->is_account) {
+        $personalTab    = $this->parent->parent->by_object['personalInfo'];
+        $account['co']  = $personalTab->co;
+      }
+    } else {
+      /* Sync partage group fields */
+      $partageTabName = 'partageGroup';
+      if ($this->type == 'sympaAlias') {
+        $partageTabName = 'sympaAliasPartage';
+      }
+      if (isset($this->parent->parent->by_object[$partageTabName]) && $this->parent->parent->by_object[$partageTabName]->is_account) {
+        $partageFields = array(
+          'displayName' => 'displayName',
+          'fdRenaterPartageGroupMailStatus' => 'zimbraMailStatus',
+          'fdRenaterPartageGroupNotes' => 'zimbraNotes'
+        );
+        $partageTab = $this->parent->parent->by_object[$partageTabName];
+        foreach ($partageFields as $fdField => $partageField) {
+          if (isset($partageTab->$fdField)) {
+            $account[$partageField] = $partageTab->$fdField;
+          }
+        }
+        $account['zimbraHideInGal'] = ($partageTab->fdRenaterPartageGroupHideInGal ? 'TRUE' : 'FALSE');
+        $account['zimbraDistributionListSendShareMessageToNewMembers'] = ($partageTab->fdRenaterPartageGroupSendShareMessageToNewMembers ? 'TRUE' : 'FALSE');
+      }
     }
 
     return $account;
@@ -248,17 +313,22 @@ class mailMethodRenaterPartage extends mailMethod
       }
     }
 
-    $userTab = $this->parent->parent->getBaseObject();
-    if ($userTab->attributesAccess['userPassword']->getClear() != '') {
-      /* Password was changed so we have the clear text password */
-      $account['password'] = $userTab->attributesAccess['userPassword']->getClear();
+    if ($this->type == 'user') {
+      $command = 'CreateAccount';
+      $userTab = $this->parent->parent->getBaseObject();
+      if ($userTab->attributesAccess['userPassword']->getClear() != '') {
+        /* Password was changed so we have the clear text password */
+        $account['password'] = $userTab->attributesAccess['userPassword']->getClear();
+      } else {
+        /* If we don’t, just give the hash */
+        $account['password']      = '';
+        $account['userPassword']  = $userTab->userPassword;
+      }
     } else {
-      /* If we don’t, just give the hash */
-      $account['password']      = '';
-      $account['userPassword']  = $userTab->userPassword;
+      $command = 'CreateGroup';
     }
 
-    return $this->query('CreateAccount', $account);
+    return $this->query($command, $account);
   }
 
   private function updateAccount($infos)
@@ -269,21 +339,26 @@ class mailMethodRenaterPartage extends mailMethod
     /* Step 2 - We compute diff from PARTAGE data */
     $this->cacheAccount();
     foreach ($account as $key => $value) {
-      if (isset($this->cacheAccount['account'][$key]) && ($this->cacheAccount['account'][$key] == $value)) {
+      if (isset($this->cachedAccount['account'][$key]) && ($this->cachedAccount['account'][$key] == $value)) {
         unset($account[$key]);
-      } elseif (!isset($this->cacheAccount['account'][$key]) && empty($value)) {
+      } elseif (!isset($this->cachedAccount['account'][$key]) && empty($value)) {
         unset($account[$key]);
       }
     }
     /* If value of zimbraAccountStatus is not something we understand, do not touch it (example: closed) */
-    if (isset($this->cacheAccount['account']['zimbraAccountStatus']) && !in_array($this->cacheAccount['account']['zimbraAccountStatus'], array('active', 'locked'))) {
+    if (isset($this->cachedAccount['account']['zimbraAccountStatus']) && !in_array($this->cachedAccount['account']['zimbraAccountStatus'], array('active', 'locked'))) {
       unset($account['zimbraAccountStatus']);
     }
 
     /* Step 3 - We send update order if diff is not empty */
     if (!empty($account)) {
       $account['name'] = $this->account_id;
-      $answer = $this->query('ModifyAccount', $account);
+      if ($this->type == 'user') {
+        $command = 'ModifyAccount';
+      } else {
+        $command = 'ModifyGroup';
+      }
+      $answer = $this->query($command, $account);
 
       if ($answer === FALSE) {
         return FALSE;
@@ -291,14 +366,117 @@ class mailMethodRenaterPartage extends mailMethod
     }
 
     /* Step 4 - Call SetPassword for password change if needed */
-    $userTab = $this->parent->parent->getBaseObject();
-    if ($userTab->attributesAccess['userPassword']->getClear() != '') {
-      $account = array(
-        'name'      => $this->account_id,
-        'password'  => $userTab->attributesAccess['userPassword']->getClear()
-      );
-      $answer = $this->query('SetPassword', $account);
+    if ($this->type == 'user') {
+      $userTab = $this->parent->parent->getBaseObject();
+      if ($userTab->attributesAccess['userPassword']->getClear() != '') {
+        $account = array(
+          'name'      => $this->account_id,
+          'password'  => $userTab->attributesAccess['userPassword']->getClear()
+        );
+        $answer = $this->query('SetPassword', $account);
+
+        if ($answer === FALSE) {
+          return FALSE;
+        }
+      }
+    }
+
+    return TRUE;
+  }
+
+  private function setAliases($initialAliases, $aliases)
+  {
+    $remove = array_diff($initialAliases, $aliases);
+    $add    = array_diff($aliases, $initialAliases);
+    if ($this->type == 'user') {
+      $command = 'RemoveAccountAlias';
+    } else {
+      $command = 'RemoveDistributionListAlias';
+    }
+    foreach ($remove as $alias) {
+      $answer = $this->query($command, array('name' => $this->account_id, 'alias' => $alias));
+      if ($answer === FALSE) {
+        return FALSE;
+      }
+    }
+    if ($this->type == 'user') {
+      $command = 'AddAccountAlias';
+    } else {
+      $command = 'AddDistributionListAlias';
+    }
+    foreach ($add as $alias) {
+      $answer = $this->query($command, array('name' => $this->account_id, 'alias' => $alias));
+      if ($answer === FALSE) {
+        return FALSE;
+      }
+    }
+    return TRUE;
+  }
+
+  private function updateMembers()
+  {
+    global $config;
 
+    if (!in_array($this->type, array('group','sympaAlias'))) {
+      return TRUE;
+    }
+
+    $this->cacheAccount();
+    $oldmembers = array();
+    if (isset($this->cachedAccount['account']['members'])) {
+      $oldmembers = $this->cachedAccount['account']['members'];
+    }
+    $mainTab = $this->parent->parent->getBaseObject();
+    $newmembers = array();
+    if ($this->type == 'sympaAlias') {
+      $newmember = '';
+      /* We take the shortest mail to filter out -editor and other addresses */
+      foreach ($mainTab->mail as $mail) {
+        if (empty($newmember) || (strlen($mail) < strlen($newmember))) {
+          $newmember = $mail;
+        }
+      }
+      $newmembers = array($newmember);
+    } elseif (isset($mainTab->member)) {
+      $ldap = $config->get_ldap_link();
+      $dns = $mainTab->member;
+      foreach ($dns as $dn) {
+        $ldap->cat($dn);
+        $attrs = $ldap->fetch();
+        if (isset($attrs['mail'][0])) {
+          $newmembers[] = $attrs['mail'][0];
+        }
+      }
+    } elseif (isset($mainTab->memberUid)) {
+      $ldap = $config->get_ldap_link();
+      $ldap->cd($config->current['BASE']);
+      $uids = $mainTab->memberUid;
+      foreach ($uids as $uid) {
+        $ldap->search('(&(objectClass=inetOrgPerson)(uid='.$uid.'))');
+        if ($ldap->count() > 1) {
+          msg_dialog::display(
+            _('PARTAGE error'),
+            sprintf(_('Several users have uid "%s". Ignoring this member.'), $uid),
+            ERROR_DIALOG
+          );
+        } elseif ($ldap->count() == 1) {
+          $attrs = $ldap->fetch();
+          if (isset($attrs['mail'][0])) {
+            $newmembers[] = $attrs['mail'][0];
+          }
+        }
+      }
+    }
+    $remove = array_diff($oldmembers, $newmembers);
+    $add    = array_diff($newmembers, $oldmembers);
+    if (!empty($remove)) {
+      $answer = $this->query('RemoveGroupMembers', array('name' => $this->account_id, 'members' => $remove));
+      if ($answer === FALSE) {
+        return FALSE;
+      }
+    }
+    if (!empty($add)) {
+      $answer = $this->query('AddGroupMembers', array('name' => $this->account_id, 'members' => $add));
       if ($answer === FALSE) {
         return FALSE;
       }
@@ -338,7 +516,12 @@ class mailMethodRenaterPartage extends mailMethod
           'name'    => $this->initial_account_id,
           'newname' => $this->account_id
         );
-        $answer = $this->query('RenameAccount', $account);
+        if ($this->type == 'user') {
+          $command = 'RenameAccount';
+        } else {
+          $command = 'RenameGroup';
+        }
+        $answer = $this->query($command, $account);
 
         if ($answer === FALSE) {
           return FALSE;
@@ -364,21 +547,15 @@ class mailMethodRenaterPartage extends mailMethod
     if (isset($this->parent->attrs['gosaMailAlternateAddress'])) {
       $initialAliases = $this->parent->attributesAccess['gosaMailAlternateAddress']->getInitialValue();
       $aliases        = $this->parent->attributesAccess['gosaMailAlternateAddress']->getValue();
-      $remove = array_diff($initialAliases, $aliases);
-      $add    = array_diff($aliases, $initialAliases);
-      foreach ($remove as $alias) {
-        $answer = $this->query('RemoveAccountAlias', array('name' => $this->account_id, 'alias' => $alias));
-        if ($answer === FALSE) {
-          return FALSE;
-        }
-      }
-      foreach ($add as $alias) {
-        $answer = $this->query('AddAccountAlias', array('name' => $this->account_id, 'alias' => $alias));
-        if ($answer === FALSE) {
-          return FALSE;
-        }
+      if (!$this->setAliases($initialAliases, $aliases)) {
+        return FALSE;
       }
     }
+
+    if (!$this->updateMembers($infos)) {
+      return FALSE;
+    }
+
     return TRUE;
   }
 
@@ -389,13 +566,17 @@ class mailMethodRenaterPartage extends mailMethod
     $infos = $servers[$this->parent->gosaMailServer];
     $this->account_id = $this->initial_account_id;
     if ($this->account_exists()) {
-      if ($infos['delete_type'] == 'delete') {
-        $answer = $this->query('DeleteAccount', array('name' => $this->initial_account_id));
-      } elseif ($infos['delete_type'] == 'disable') {
-        $answer = $this->query('ModifyAccount', array('name' => $this->initial_account_id, 'zimbraAccountStatus' => 'closed'));
+      if ($this->type == 'user') {
+        if ($infos['delete_type'] == 'delete') {
+          $answer = $this->query('DeleteAccount', array('name' => $this->initial_account_id));
+        } elseif ($infos['delete_type'] == 'disable') {
+          $answer = $this->query('ModifyAccount', array('name' => $this->initial_account_id, 'zimbraAccountStatus' => 'closed'));
+        } else {
+          $answer = FALSE;
+          $this->error = _('Invalid value in fdRenaterPartageServerDeletionType');
+        }
       } else {
-        $answer = FALSE;
-        $this->error = _('Invalid value in fdRenaterPartageServerDeletionType');
+        $answer = $this->query('DeleteGroup', array('name' => $this->initial_account_id));
       }
       return ($answer !== FALSE);
     }
@@ -426,13 +607,6 @@ class mailMethodRenaterPartage extends mailMethod
     return $quotaValue;
   }
 
-  /*! \brief  Sets the mail quota
-   */
-  public function setQuota($number)
-  {
-    return parent::setQuota($number);
-  }
-
   public function additionalInformations()
   {
     if ($this->cacheAccount()) {
diff --git a/repository/locale/ar/fusiondirectory.po b/repository/locale/ar/fusiondirectory.po
index 1066b3d7200c1ea496f8439d5263a282967b967c..f0e306b0b59912eea96f5d8cb1cdea9f60ed8cf6 100644
--- a/repository/locale/ar/fusiondirectory.po
+++ b/repository/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/repository/locale/ca/fusiondirectory.po b/repository/locale/ca/fusiondirectory.po
index a3ae588c88f7dfde5ce53c3c8d061b1956bdfc7a..dff562675f83dc82bba8883b33415322aad9a737 100644
--- a/repository/locale/ca/fusiondirectory.po
+++ b/repository/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/repository/locale/cs_CZ/fusiondirectory.po b/repository/locale/cs_CZ/fusiondirectory.po
index 6cd0d1de597183fb3c0549fb5196bc5cdb60534c..10085831a049d3d99fecbf91600f5ddc153d05fa 100644
--- a/repository/locale/cs_CZ/fusiondirectory.po
+++ b/repository/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/repository/locale/de/fusiondirectory.po b/repository/locale/de/fusiondirectory.po
index 9156de32b9367eb33cc110d42ac3037a670a339a..5c34715096afe699109a7f2f3cd193d06e4a6b8b 100644
--- a/repository/locale/de/fusiondirectory.po
+++ b/repository/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/repository/locale/el_GR/fusiondirectory.po b/repository/locale/el_GR/fusiondirectory.po
index 63712fe07488913056e29d43d3d4a44b42de2288..39e85c5d229865301529708c6d8a1dc38ff5f0a8 100644
--- a/repository/locale/el_GR/fusiondirectory.po
+++ b/repository/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/repository/locale/en/fusiondirectory.po b/repository/locale/en/fusiondirectory.po
index 7ce91016a71939bc0593f7364351687d0de0c19f..b02a7bdca67da45d40696abd43e28046d85f24a6 100644
--- a/repository/locale/en/fusiondirectory.po
+++ b/repository/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/repository/locale/es/fusiondirectory.po b/repository/locale/es/fusiondirectory.po
index 1a8157353c3491f8c4e9024693090bb0096a668d..64fe992a414e54137f7e34fc6b14ab8985851349 100644
--- a/repository/locale/es/fusiondirectory.po
+++ b/repository/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/repository/locale/es_CO/fusiondirectory.po b/repository/locale/es_CO/fusiondirectory.po
index e22ceb51a759e273bd3c2ef96cd71a263125c4c1..c54f78b8ee5a002c740b72bb042f0d6068b3f1b8 100644
--- a/repository/locale/es_CO/fusiondirectory.po
+++ b/repository/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/repository/locale/es_VE/fusiondirectory.po b/repository/locale/es_VE/fusiondirectory.po
index 3753d3a241647518297796de76fa9c00cfa0eef9..16a78fa732dfa47b74279633ba5257cb9e7e6dce 100644
--- a/repository/locale/es_VE/fusiondirectory.po
+++ b/repository/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/repository/locale/fa_IR/fusiondirectory.po b/repository/locale/fa_IR/fusiondirectory.po
index 24ed490d54e073c96cad9fed08b60060aaea830a..8f26d293b6a485a99fae8224d8ccf328a2b57eaa 100644
--- a/repository/locale/fa_IR/fusiondirectory.po
+++ b/repository/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/repository/locale/fi_FI/fusiondirectory.po b/repository/locale/fi_FI/fusiondirectory.po
index 5a9cd77f05422be849238262e5eb1c397c04f32e..140252e3a6da5aebc3fc8f73b1ac685c951e8e5f 100644
--- a/repository/locale/fi_FI/fusiondirectory.po
+++ b/repository/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/repository/locale/fr/fusiondirectory.po b/repository/locale/fr/fusiondirectory.po
index 48316cd19a67425c623daff72aa45e310355e821..b8858c67cbb149245ff8aef8927ab285d5b232f1 100644
--- a/repository/locale/fr/fusiondirectory.po
+++ b/repository/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,11 +33,11 @@ msgstr "Dépôt"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Repository RDN"
-msgstr "RDN Repository"
+msgstr "Branche des dépôts"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Branch in which repository objects will be stored"
-msgstr "Branche où seront stockés les objets dépots"
+msgstr "Branche où seront stockés les objets dépôts"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Repository types"
@@ -45,14 +45,14 @@ msgstr "Types de dépôt"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Available repository types"
-msgstr "Type de tests disponibles"
+msgstr "Types de dépôts disponibles"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
 #: admin/repository/class_buildRepository.inc:33
 #: admin/repository/class_buildRepository.inc:59
 msgid "Build repository"
-msgstr "Construire un dépôt"
+msgstr "Dépôt de construction"
 
 #: admin/repository/class_buildRepository.inc:63
 #: admin/repository/class_repositoryDistribution.inc:60
@@ -76,7 +76,7 @@ msgstr "Description de ce dépôt"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "Distribution sections"
-msgstr "Section du dépôt"
+msgstr "Sections du dépôt"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "The distribution sections this repository provides"
@@ -136,7 +136,7 @@ msgstr "Gestion des dépots"
 #: admin/repository/class_repositoryDistribution.inc:33
 #: admin/repository/class_repositoryDistribution.inc:56
 msgid "Repository distribution"
-msgstr "Distribution du dépôt"
+msgstr "Distribution de dépôt"
 
 #: admin/repository/class_repositoryDistribution.inc:60
 msgid "Unique name for this distribution"
@@ -152,23 +152,23 @@ msgstr "Section"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "The sections this distribution contains"
-msgstr "Les section que cette distribution contient"
+msgstr "Les sections que cette distribution contient"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 #: admin/repository/class_repositorySection.inc:66
 msgid "Based on"
-msgstr "basé sur"
+msgstr "Basé sur"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 msgid "The distributions this one is based on"
-msgstr "Les distributions dont celui-ci est basé sur"
+msgstr "Les distributions sur lesquelles se base celle-ci"
 
 #: admin/repository/class_repositorySection.inc:30
 #: admin/repository/class_repositorySection.inc:31
 #: admin/repository/class_repositorySection.inc:33
 #: admin/repository/class_repositorySection.inc:53
 msgid "Repository section"
-msgstr "Section du dépôt"
+msgstr "Section de dépôt"
 
 #: admin/repository/class_repositorySection.inc:57
 msgid "Unique name for this section"
@@ -180,4 +180,4 @@ msgstr "Description pour cette section"
 
 #: admin/repository/class_repositorySection.inc:66
 msgid "The sections this one is based on"
-msgstr "Les sections dont celui-ci est basé sur"
+msgstr "Les sections sur lesquelles est basée celle-ci"
diff --git a/repository/locale/hu_HU/fusiondirectory.po b/repository/locale/hu_HU/fusiondirectory.po
index 4d70f21c57bf60ca0e78dc5865aa27cb7e14b893..6419ba5274bbdb2ac1cf0ed903b5ad9a461533da 100644
--- a/repository/locale/hu_HU/fusiondirectory.po
+++ b/repository/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/repository/locale/id/fusiondirectory.po b/repository/locale/id/fusiondirectory.po
index 5e3c3e9a7bfb4db8e215e0e181d04748ad627df8..b698772e476d3a906c3db00ccd540f097a33a664 100644
--- a/repository/locale/id/fusiondirectory.po
+++ b/repository/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/repository/locale/it_IT/fusiondirectory.po b/repository/locale/it_IT/fusiondirectory.po
index 4fad45e60c4a9a79fe0d3c84c5eb017fdd9c527f..ed9b80539f3c81166347c82f500adb35b5aff626 100644
--- a/repository/locale/it_IT/fusiondirectory.po
+++ b/repository/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/repository/locale/lv/fusiondirectory.po b/repository/locale/lv/fusiondirectory.po
index 6fffd836b01c973c8dbdc8afbd9b09dae0e26b1c..235a5a750367ebd72d0e9334c2e3cb5035d9bdce 100644
--- a/repository/locale/lv/fusiondirectory.po
+++ b/repository/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/repository/locale/nb/fusiondirectory.po b/repository/locale/nb/fusiondirectory.po
index f1c9570bc4ea63721b94d92959417f502430c8d8..a11d2c8fbc9c96d4f6efd253ce07ec97b67e094e 100644
--- a/repository/locale/nb/fusiondirectory.po
+++ b/repository/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/repository/locale/nl/fusiondirectory.po b/repository/locale/nl/fusiondirectory.po
index 927367b08dc3f91d4d113c77255b267faa5ee9a3..12c6ff4f86656d034e724d4de1cdbbbd90876e88 100644
--- a/repository/locale/nl/fusiondirectory.po
+++ b/repository/locale/nl/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:28
 msgid "Repository configuration"
-msgstr ""
+msgstr "Repository configuratie"
 
 #: config/repository/class_repositoryConfig.inc:29
 msgid "FusionDirectory repository plugin configuration"
-msgstr ""
+msgstr "FusionDirectory respository plugin configuratie"
 
 #: config/repository/class_repositoryConfig.inc:42
 #: admin/repository/class_repositoryManagement.inc:34
diff --git a/repository/locale/pl/fusiondirectory.po b/repository/locale/pl/fusiondirectory.po
index 0e527b5838d08ee806998e9096faa106e97e0b1f..be54606af55150a34e100e40fee25b6ed4d45f1a 100644
--- a/repository/locale/pl/fusiondirectory.po
+++ b/repository/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/repository/class_repositoryConfig.inc:28
 msgid "Repository configuration"
diff --git a/repository/locale/pt/fusiondirectory.po b/repository/locale/pt/fusiondirectory.po
index 4ee9624445f127910c397d58b419de9936969545..c9a3f0c6171ba6b7f7b63170d0ab23abdbdcc8bf 100644
--- a/repository/locale/pt/fusiondirectory.po
+++ b/repository/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/repository/locale/pt_BR/fusiondirectory.po b/repository/locale/pt_BR/fusiondirectory.po
index f21ba5684f9d35d68926d5b7994815514057333c..9023cf96f0cf0ca150a1b61e2a3fe902ca7732b4 100644
--- a/repository/locale/pt_BR/fusiondirectory.po
+++ b/repository/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/repository/locale/ru/fusiondirectory.po b/repository/locale/ru/fusiondirectory.po
index fae1cb070c0f3777f98e66559eb91584d1866fda..eac2d4522b91b3f93cc134a7b50bb9b6401b0d27 100644
--- a/repository/locale/ru/fusiondirectory.po
+++ b/repository/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/repository/locale/ru@petr1708/fusiondirectory.po b/repository/locale/ru@petr1708/fusiondirectory.po
index f269b290ccd8535d4cfd4e6a40090795dc8f9c4b..e8c3b17d07dd4f79dbeb718e1631180a628f4764 100644
--- a/repository/locale/ru@petr1708/fusiondirectory.po
+++ b/repository/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/repository/locale/sv/fusiondirectory.po b/repository/locale/sv/fusiondirectory.po
index 7a0a919a5e533e6652b0f0582a30350e157ad4db..1c0b6eb9066dca52c2ba9bd1f3c9f45587973379 100644
--- a/repository/locale/sv/fusiondirectory.po
+++ b/repository/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/repository/locale/ug/fusiondirectory.po b/repository/locale/ug/fusiondirectory.po
index 2cda7ccb3a8e5d0d544037ffc1ef2fc1b58b8924..db5863fa907aa5b31c543a81a364ebd1f45d1a4f 100644
--- a/repository/locale/ug/fusiondirectory.po
+++ b/repository/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/repository/locale/vi_VN/fusiondirectory.po b/repository/locale/vi_VN/fusiondirectory.po
index b97eedfc1a0db7307fba0ad5ebc8a2a0aff3e0b3..cfa6d82418d4d68e1ede7903b816bfb250b74599 100644
--- a/repository/locale/vi_VN/fusiondirectory.po
+++ b/repository/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/repository/locale/zh/fusiondirectory.po b/repository/locale/zh/fusiondirectory.po
index 98088e6a405b120efb61ea93732b8dfa4e63417f..ba91ab14cac0ae1e3e6dbc30aae921baddf76d64 100644
--- a/repository/locale/zh/fusiondirectory.po
+++ b/repository/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/samba/locale/ar/fusiondirectory.po b/samba/locale/ar/fusiondirectory.po
index 8c5722a271ed13db7ac14827c921c9134aeee125..bfea0e4b198280f213c0ea174b0d283c25af369d 100644
--- a/samba/locale/ar/fusiondirectory.po
+++ b/samba/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -302,36 +302,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "تحذير"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/ca/fusiondirectory.po b/samba/locale/ca/fusiondirectory.po
index 143b74e28de92a72818cd5cab74f1142b76351c4..89ffab4b9849fa6f65e5d5424d86269738ca67b1 100644
--- a/samba/locale/ca/fusiondirectory.po
+++ b/samba/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -302,36 +302,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Avís"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/cs_CZ/fusiondirectory.po b/samba/locale/cs_CZ/fusiondirectory.po
index 7ec01eccaaaeea7f60eb64461021b4627f6e0cae..66b197a435d61f5385d9b27c98e308b281802a37 100644
--- a/samba/locale/cs_CZ/fusiondirectory.po
+++ b/samba/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -306,40 +306,38 @@ msgstr "povolit připojení pouze z těchto pracovních stanic"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Tomuto uživateli povolit připojení pouze na počítače z tohoto seznamu"
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "domovské úložiště"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
-msgstr "cesta k domovskému úložišti"
-
+#: personal/samba/class_sambaAccount.inc:479
 #: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Správce uživatelských účtů v MS Windows povoluje maximálně 8 klientů!"
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "varování"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Zjištěno nedefinované SID Samby. Prosím opravte tento problém ručním zásahem"
 " do nastavení!"
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Nemohu převést primární skupinu na skupinu Samby: skupinu se nepodařilo "
 "identifikovat!"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/de/fusiondirectory.po b/samba/locale/de/fusiondirectory.po
index 0cc4da74e0bd95b36ea66a1f06f0e5b2508aa4fd..6cea09f18c650027709457f299c18a422cd2d724 100644
--- a/samba/locale/de/fusiondirectory.po
+++ b/samba/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -304,40 +304,38 @@ msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Nur diesem Benutzer erlauben, dieser Liste von Hosts zu verbinden"
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "Basis-Laufwerk"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
-msgstr "Basis-Pfad"
-
+#: personal/samba/class_sambaAccount.inc:479
 #: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Der Windows Benutzermanager erlaubt maximal acht Clients!"
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Warnung"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Undefinierte Samba SID festgestellt. Bitte beheben Sie dieses Problem "
 "manuell!"
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Kann primäre Gruppe nicht in Samba-Gruppe überführen: die Gruppe kann nicht "
 "identifiziert werden!"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/el_GR/fusiondirectory.po b/samba/locale/el_GR/fusiondirectory.po
index 267cd2bb40e3c659f8c571d91e0456299bd425b5..a7bc9131a01b864efe67a638cdcde39c188a3347 100644
--- a/samba/locale/el_GR/fusiondirectory.po
+++ b/samba/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -303,40 +303,38 @@ msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 "Επιτρέπεται σ'αυτόν τον χρήστη να συνδέεται στην ακόλουθη λίστα διακομιστών"
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "Προσωπικός οδηγός"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
-msgstr "Μονοπάτι προσωπικού καταλόγου"
-
+#: personal/samba/class_sambaAccount.inc:479
 #: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Ο διαχειριστής χρηστών των Windows επιτρέπει μέγιστο αριθμό 8 πελατών"
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Ανιχνεύθηκε απροσριόριστο Samba SID. Παρακαλείστε να διορθώσετε χειροκίνητα "
 "το πρόβλημα."
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Δεν είναι δυνατή η μετατροπή της κύριας ομάδας σε ομάδα Samba: η ομάδα δεν "
 "ταυτοποιείται"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/en/fusiondirectory.po b/samba/locale/en/fusiondirectory.po
index e49cd4be683ae01d2072eccd2438cbc3262fb737..f9e0ac4a638b26ec2e13207eb4cb538709fb65be 100644
--- a/samba/locale/en/fusiondirectory.po
+++ b/samba/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -301,36 +301,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid ""
+"Field \"%s\" is required when \"%s\" is filled! Fill both field or empty "
+"them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/es/fusiondirectory.po b/samba/locale/es/fusiondirectory.po
index ab14890c19d8cafacbfc2778a232768cb72a9f3f..aebb8c01a997801d5b534b8775c682bdd1d100ea 100644
--- a/samba/locale/es/fusiondirectory.po
+++ b/samba/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -302,40 +302,38 @@ msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "Unidad inicial"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
-msgstr "Ruta inicial"
-
+#: personal/samba/class_sambaAccount.inc:479
 #: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema"
 " manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "No se puede convertir un grupo primario a grupo samba: ¡El grupo no puede "
 "ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/es_CO/fusiondirectory.po b/samba/locale/es_CO/fusiondirectory.po
index 58c0c80ecbc174e37c32b7966071cc0449a5ea9b..2d79578eb1d2764e39429b4407cd8ab430d23ae7 100644
--- a/samba/locale/es_CO/fusiondirectory.po
+++ b/samba/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -304,36 +304,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Permitir a este usuario conectarse a esta lista de hosts."
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Precacuión"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/es_VE/fusiondirectory.po b/samba/locale/es_VE/fusiondirectory.po
index 46bf1d1fb00b5245572ac0e920e10da9415bf2b2..9fce41bfa91d6b9d8a8daf2d6113ed0dbf4f34f0 100644
--- a/samba/locale/es_VE/fusiondirectory.po
+++ b/samba/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -302,41 +302,39 @@ msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "Unidad inicial"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
-msgstr "Ruta inicial"
-
+#: personal/samba/class_sambaAccount.inc:479
 #: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 "El manejador de usuarios de Windows permite un máximo de ocho clientes!"
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema"
 " manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "No se puede convertir un grupo primario a grupo samba: ¡El grupo no puede "
 "ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/fa_IR/fusiondirectory.po b/samba/locale/fa_IR/fusiondirectory.po
index 1d18bf05008d6e0cb316b061584ed05b0db11b8a..f8d4f2aaa6e9b41ce1e359213a00b3e17b28029a 100644
--- a/samba/locale/fa_IR/fusiondirectory.po
+++ b/samba/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -301,36 +301,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/fi_FI/fusiondirectory.po b/samba/locale/fi_FI/fusiondirectory.po
index 85368ea37604bb13f5cdc17b3c3f0417c44a51c5..d302978db75f3b757f1ac7d4bac2ddd594c986bc 100644
--- a/samba/locale/fi_FI/fusiondirectory.po
+++ b/samba/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -302,36 +302,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Varoitus"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/fr/fusiondirectory.po b/samba/locale/fr/fusiondirectory.po
index 4a8e9c2fdce64d9c07edfad783d5d85ce70427df..6a4d14bcbf76ff4175853fcf5fafcff6eda6c689 100644
--- a/samba/locale/fr/fusiondirectory.po
+++ b/samba/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -306,39 +306,39 @@ msgstr "Permet la connections depuis ces stations seulement"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Autoriser seulement cet utilisateur à se connecter sur cet hôte"
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "Répertoire Home"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
-msgstr "Chemin du répertoire personnel"
-
+#: personal/samba/class_sambaAccount.inc:479
 #: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+"Le champ \"%s\" est requis lorsque \"%s\" est rempli ! Remplissez les deux "
+"champs ou videz les."
+
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Le gestionnaire d'utilisateurs windows accepte huit clients maximum !"
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Avertissement"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Détection d'un SID Samba non défini. Veuillez fixer ceci manuellement !"
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Impossible de convertir le groupe primaire en un groupe primaire samba : le "
 "groupe ne peut être identifié !"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/hu_HU/fusiondirectory.po b/samba/locale/hu_HU/fusiondirectory.po
index 5671287549e23ccd8cf3aa4efaac31a32a64acb5..ba360f7dd79bbe5b95a75e4cbb610c85dc3adcb3 100644
--- a/samba/locale/hu_HU/fusiondirectory.po
+++ b/samba/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -301,36 +301,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/id/fusiondirectory.po b/samba/locale/id/fusiondirectory.po
index a46e15aa23c77db9f05392bd19ac17a888401f64..c0d3fcbadac2f1789a4f32f43c2e501f49083162 100644
--- a/samba/locale/id/fusiondirectory.po
+++ b/samba/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -301,36 +301,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/it_IT/fusiondirectory.po b/samba/locale/it_IT/fusiondirectory.po
index c955174e9965dc51b0ddfcb6fe3d2a19a66a0c93..bbfd76940956bf416520f0c71f1435d439f06cea 100644
--- a/samba/locale/it_IT/fusiondirectory.po
+++ b/samba/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -304,39 +304,39 @@ msgstr "Autorizza la connessione solo da queste workstation"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host"
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "Cartella personale dell'utente"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
-msgstr "Path della cartella personale dell'utente"
-
+#: personal/samba/class_sambaAccount.inc:479
 #: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+"Il campo \"%s\" è necessario quando \"%s\" è pieno! Riempire entrambi i "
+"campi o svuotarli."
+
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Il gestore degli utenti di Windows accetta solo 8 clienti alla volta!"
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "É stato trovato un SID Samba che non è definito. Correggi manualmente !"
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Impossibile convertire il gruppo primario in un gruppo primario di samba : "
 "il gruppo non puó essere identificato !"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/lv/fusiondirectory.po b/samba/locale/lv/fusiondirectory.po
index b837b35021e3b8e4dc478ef23f2d728e56254529..5b7539f0f802e870138922ae2acc820436071470 100644
--- a/samba/locale/lv/fusiondirectory.po
+++ b/samba/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -302,36 +302,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/nb/fusiondirectory.po b/samba/locale/nb/fusiondirectory.po
index a67df908554fb20ef2e521e6667d8af8c798bd77..1ac581ca88f7a0feb4422b4efab45eb7d104a31d 100644
--- a/samba/locale/nb/fusiondirectory.po
+++ b/samba/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -302,36 +302,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/nl/fusiondirectory.po b/samba/locale/nl/fusiondirectory.po
index 479e2cf86bc31438f78393423a535b6b03e0393b..c4b685dcc57f23f718c34b6ff5733afdeda38f1b 100644
--- a/samba/locale/nl/fusiondirectory.po
+++ b/samba/locale/nl/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Joeri Puttevils <joeri.puttevils@connict.net>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +23,8 @@ msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
 msgstr ""
+"Je PHP-installatie heeft noch de mhash() noch de hash functie. Kan geen "
+"MD4-hashes uitvoeren."
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -38,11 +40,11 @@ msgstr "Samba"
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
-msgstr "Samba Instellingen"
+msgstr "Samba-instellingen"
 
 #: personal/samba/class_sambaAccount.inc:183
 msgid "Samba profile"
-msgstr "Samba profiel"
+msgstr "Sambaprofiel"
 
 #: personal/samba/class_sambaAccount.inc:189
 #: personal/samba/class_sambaAccount.inc:222
@@ -74,15 +76,15 @@ msgstr "Domein"
 #: personal/samba/class_sambaAccount.inc:199
 #: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
-msgstr "Sambe domeinnaam"
+msgstr "Sambadomeinnaam"
 
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
-msgstr "Inlogscript"
+msgstr "Scriptpad"
 
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Login script path"
-msgstr "Pad van het login script"
+msgstr "Pad van het loginscript"
 
 #: personal/samba/class_sambaAccount.inc:207
 #: personal/samba/class_sambaAccount.inc:232
@@ -96,15 +98,15 @@ msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:214
 msgid "Terminal server"
-msgstr "Terminal server"
+msgstr "Terminalserver"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Allow login on terminal server"
-msgstr "Sta inloggen op de Terminal Server toe"
+msgstr "Inloggen op de Terminal Server toestaan"
 
 #: personal/samba/class_sambaAccount.inc:237
 msgid "Inherit client config"
-msgstr "Client configuratie voor initieel programma overnemen"
+msgstr "Clientconfiguratie overerven"
 
 #: personal/samba/class_sambaAccount.inc:237
 msgid "Inherit client configuration"
@@ -152,7 +154,7 @@ msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:264
 msgid "Connect client drives at logon"
-msgstr "Verbindt client schijven bij inloggen"
+msgstr "Verbind netwerkschijven bij inloggen"
 
 #: personal/samba/class_sambaAccount.inc:264
 msgid "Drive to connect after login"
@@ -160,47 +162,47 @@ msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:268
 msgid "Connect client printers at logon"
-msgstr "Verbindt client printers bij inloggen"
+msgstr "Verbind netwerkprinters bij inloggen"
 
 #: personal/samba/class_sambaAccount.inc:268
 msgid "Printers to connect after login"
-msgstr "Printers die connecteren na het inloggen"
+msgstr "Printers te verbinden na het inloggen"
 
 #: personal/samba/class_sambaAccount.inc:272
 msgid "Default to main client printer"
-msgstr "Standaard printer als client printer"
+msgstr "Gebruik de standaard clientprinter tenzij expliciet gedefinieerd"
 
 #: personal/samba/class_sambaAccount.inc:272
 msgid "Default printer for this client"
-msgstr "Standaard printer voor de client"
+msgstr "Standaardprinter voor deze client"
 
 #: personal/samba/class_sambaAccount.inc:276
 msgid "Shadowing"
-msgstr "Schaduwen van andere sessie"
+msgstr "Meekijken"
 
 #: personal/samba/class_sambaAccount.inc:279
 msgid "disabled"
-msgstr "gedeactiveerd"
+msgstr "uitgeschakeld"
 
 #: personal/samba/class_sambaAccount.inc:279
 msgid "input on, notify on"
-msgstr "invoer met notificatie"
+msgstr "invoer en notificatie aan"
 
 #: personal/samba/class_sambaAccount.inc:279
 msgid "input on, notify off"
-msgstr "invoer zonder notificatie"
+msgstr "invoer aan, notificatie uit"
 
 #: personal/samba/class_sambaAccount.inc:280
 msgid "input off, notify on"
-msgstr "geen invoer met notificatie"
+msgstr "invoer uit, notificatie aan"
 
 #: personal/samba/class_sambaAccount.inc:280
 msgid "input off, nofify off"
-msgstr "geen invoer zonder notificatie"
+msgstr "invoer en notificatie uit"
 
 #: personal/samba/class_sambaAccount.inc:283
 msgid "On broken or timed out"
-msgstr "Bij verbroken verbinding of timeout"
+msgstr "Bij onderbreking of time-out"
 
 #: personal/samba/class_sambaAccount.inc:283
 msgid "What happen if disconnected or timeout"
@@ -212,11 +214,11 @@ msgstr "verbreken"
 
 #: personal/samba/class_sambaAccount.inc:286
 msgid "reset"
-msgstr "herstellen"
+msgstr "resetten"
 
 #: personal/samba/class_sambaAccount.inc:289
 msgid "Reconnect if disconnected"
-msgstr "Herstel sessie indien verbroken"
+msgstr "Verbind opnieuw indien verbroken"
 
 #: personal/samba/class_sambaAccount.inc:292
 msgid "from any client"
@@ -224,7 +226,7 @@ msgstr "vanaf elke client"
 
 #: personal/samba/class_sambaAccount.inc:292
 msgid "from previous client only"
-msgstr "alleen vanaf vorige client"
+msgstr "enkel vanaf vorige client"
 
 #: personal/samba/class_sambaAccount.inc:304
 msgid "Access options"
@@ -232,7 +234,7 @@ msgstr "Toegangsopties"
 
 #: personal/samba/class_sambaAccount.inc:308
 msgid "Enforce password change"
-msgstr "Forceer paswoord wijzigen"
+msgstr "Dwing wijzigen wachtwoord af"
 
 #: personal/samba/class_sambaAccount.inc:308
 msgid "Force the user to change his password"
@@ -248,7 +250,7 @@ msgstr "Het wachtwoord zal nooit vervallen"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Login from windows client requires no password"
-msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
+msgstr "Inloggen vanop Windowstoestel zonder wachtwoord toestaan"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Login from a client without a password"
@@ -256,7 +258,7 @@ msgstr "Inloggen vanaf een client zonder wachtwoord"
 
 #: personal/samba/class_sambaAccount.inc:323
 msgid "Lock samba account"
-msgstr "Blokkeer Samba/Windows account"
+msgstr "Blokkeer Samba account"
 
 #: personal/samba/class_sambaAccount.inc:323
 msgid "Lock the account"
@@ -264,11 +266,11 @@ msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:328
 msgid "Cannot change password"
-msgstr "Kan paswoord niet wijzigen"
+msgstr "Kan wachtwoord niet wijzigen"
 
 #: personal/samba/class_sambaAccount.inc:328
 msgid "Not allowed to change password"
-msgstr "Niet mogelijk om het wachtwoord te wijzigen"
+msgstr "Niet toegelaten om het wachtwoord te wijzigen"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "Account expiration"
@@ -276,15 +278,15 @@ msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "When does the account expire"
-msgstr "Wanneer zal dit account vervallen"
+msgstr "Wanneer vervalt het account"
 
 #: personal/samba/class_sambaAccount.inc:340
 msgid "Samba logon times"
-msgstr "Samba inlog tijdstippen"
+msgstr "Samba inlogtijdstippen"
 
 #: personal/samba/class_sambaAccount.inc:340
 msgid "What is the allowed time to connect"
-msgstr "Wat is de toegelaten tijd om te verbinden"
+msgstr "Wanneer is het toegelaten om te verbinden"
 
 #: personal/samba/class_sambaAccount.inc:341
 msgid "Edit settings"
@@ -292,50 +294,48 @@ msgstr "Instellingen bewerken"
 
 #: personal/samba/class_sambaAccount.inc:357
 msgid "System trust"
-msgstr "Systeem vertrouwen"
+msgstr "Systeem vertrouwensrelatie"
 
 #: personal/samba/class_sambaAccount.inc:363
 msgid "Allow connection from these workstations only"
-msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
+msgstr "Sta verbinden enkel toe vanaf deze werkstation"
 
 #: personal/samba/class_sambaAccount.inc:363
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "Home drive"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
-msgstr "Home path"
-
+#: personal/samba/class_sambaAccount.inc:479
 #: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "De windows gebruikers manager laat maximum 8 clients toe!"
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Er is een ongedefinieerd SambaSID geselecteerd. Repareer dit probleem a.u.b."
 " handmatig!"
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Kan primaire groep niet in een samba groep omzetten: group kan niet "
 "geidentificeerd worden"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/pl/fusiondirectory.po b/samba/locale/pl/fusiondirectory.po
index 7736ff033765199afb4a8632a7bb3061e12bdc3e..b5cc4f18ddc4fb9932ed9cdca688552bc21e3882 100644
--- a/samba/locale/pl/fusiondirectory.po
+++ b/samba/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: include/class_smbHash.inc:356
 msgid ""
@@ -302,36 +302,34 @@ msgstr "Zezwól na połączenia tylko z tych stacji"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/pt/fusiondirectory.po b/samba/locale/pt/fusiondirectory.po
index 8c0b8253eaf7359f3ff0d28beb297746df8ee704..eb51f7de137a2f61c82dcae9aee0d042a571b0dd 100644
--- a/samba/locale/pt/fusiondirectory.po
+++ b/samba/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -302,36 +302,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Atenção"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/pt_BR/fusiondirectory.po b/samba/locale/pt_BR/fusiondirectory.po
index 622e01bd6a3008c37a8ff38a9da5146383f786dd..5c801f4c04a0c6c7dbc80ecb9d80f36d56a33805 100644
--- a/samba/locale/pt_BR/fusiondirectory.po
+++ b/samba/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -304,39 +304,37 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Permitir apenas que este usuário conecte-se à lista de hosts"
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Detectado Samba SID indefinido. Favor corrigir este problema manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Não é possível converter o grupo principal para o grupo samba: o grupo não "
 "pode ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/ru/fusiondirectory.po b/samba/locale/ru/fusiondirectory.po
index 314c4a29a4afddf341c6a7a48153c54528397030..30854b7c8872893df9da13c3259da762c99a05ad 100644
--- a/samba/locale/ru/fusiondirectory.po
+++ b/samba/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -305,36 +305,34 @@ msgstr "Разрешить подключения только от этой р
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Пользователю разрешено подключаться только к хостам из списка"
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr "Домашний диск"
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/ru@petr1708/fusiondirectory.po b/samba/locale/ru@petr1708/fusiondirectory.po
index c3aeabc9a5b33b2d611d03b43358170ca262c8bd..e85a191fe8a34321f6851da054a722762b3a7c4c 100644
--- a/samba/locale/ru@petr1708/fusiondirectory.po
+++ b/samba/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -301,36 +301,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/sv/fusiondirectory.po b/samba/locale/sv/fusiondirectory.po
index 7d0397ab00662e1a102df52e6ea3c7e2e05dec4e..0164c283b106ad01a49ab0d5f2f93925ffd47ddf 100644
--- a/samba/locale/sv/fusiondirectory.po
+++ b/samba/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -304,36 +304,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Tillåt användaren att endast logga in på denna lista av hosts"
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Varning"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/ug/fusiondirectory.po b/samba/locale/ug/fusiondirectory.po
index 967d04e856003f9a86b5d5041d5d4f92694d8241..3267343d46cb47d4950aa5cd92631fe1286012e4 100644
--- a/samba/locale/ug/fusiondirectory.po
+++ b/samba/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -301,36 +301,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/vi_VN/fusiondirectory.po b/samba/locale/vi_VN/fusiondirectory.po
index 42bd30d8dc73c40b7caf05773e0d94abbf5abfc0..a9c0c62fb4b0dce86fdd38892cea1ede1b22b2d3 100644
--- a/samba/locale/vi_VN/fusiondirectory.po
+++ b/samba/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -302,36 +302,34 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/locale/zh/fusiondirectory.po b/samba/locale/zh/fusiondirectory.po
index eaafd39a2b5550f999cef4d90dce22f121211083..322427ae59a6dcff73ab741304cb87c733659859 100644
--- a/samba/locale/zh/fusiondirectory.po
+++ b/samba/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -302,36 +302,34 @@ msgstr "只允许从这些工作站建立连接"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Home drive"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:481
-msgid "Home path"
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:486
+#: personal/samba/class_sambaAccount.inc:494
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:503
-#: personal/samba/class_sambaAccount.inc:529
-#: personal/samba/class_sambaAccount.inc:550
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "警告"
 
-#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:511
 #: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:530
+#: personal/samba/class_sambaAccount.inc:538
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:551
+#: personal/samba/class_sambaAccount.inc:559
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
diff --git a/samba/personal/samba/class_sambaAccount.inc b/samba/personal/samba/class_sambaAccount.inc
index e3fc12139bfd38609f85b358df36e0771b867351..bd7b8f38ccb9fc130ff8d5abf9913a9d9882fdc0 100644
--- a/samba/personal/samba/class_sambaAccount.inc
+++ b/samba/personal/samba/class_sambaAccount.inc
@@ -475,15 +475,23 @@ class sambaAccount extends simplePlugin
 
     /* sambaHomePath requires sambaHomeDrive and vice versa */
     if (!empty($this->sambaHomePath) && empty($this->sambaHomeDrive)) {
-        $messages[] = msgPool::required(_("Home drive"));
+      $messages[] = sprintf(
+        _('Field "%s" is required when "%s" is filled! Fill both field or empty them.'),
+        $this->attributesAccess['sambaHomeDrive']->getLabel(),
+        $this->attributesAccess['sambaHomePath']->getLabel()
+      );
     }
     if (!empty($this->sambaHomeDrive) && empty($this->sambaHomePath)) {
-        $messages[] = msgPool::required(_("Home path"));
+      $messages[] = sprintf(
+        _('Field "%s" is required when "%s" is filled! Fill both field or empty them.'),
+        $this->attributesAccess['sambaHomePath']->getLabel(),
+        $this->attributesAccess['sambaHomeDrive']->getLabel()
+      );
     }
 
     /* Too many workstations? Windows usrmgr only supports eight */
     if (count($this->attributesAccess['sambaUserWorkstations']->attributes[0]->getValue()) >= 8) {
-        $messages[] = _("The windows user manager allows eight clients at maximum!");
+      $messages[] = _('The windows user manager allows eight clients at maximum!');
     }
 
     return $messages;
@@ -587,7 +595,12 @@ class sambaAccount extends simplePlugin
       }
     } elseif ($config->get_cfg_value('sambaExpirationSync') == 'posix') {
       if ($this->parent->by_object['posixAccount']->shadowExpire != "") {
-        $this->attrs['sambaKickoffTime'] = $this->parent->by_object['posixAccount']->attributesAccess['shadowExpire']->getDateValue()->format('U');
+        try {
+          $this->attrs['sambaKickoffTime'] = $this->parent->by_object['posixAccount']->attributesAccess['shadowExpire']->getDateValue()->format('U');
+        } catch (Exception $e) {
+          // shadowExpire is an invalid date, most likely because we’re a template and it uses patterns
+          $this->attrs['sambaKickoffTime'] = array();
+        }
       } else {
         $this->attrs['sambaKickoffTime'] = array();
       }
diff --git a/sogo/locale/ar/fusiondirectory.po b/sogo/locale/ar/fusiondirectory.po
index e9c61d87db28eb500fdad29373914a15fba42961..bb7707fb3f08ca86ddf69520ab2ec6dde6f5e066 100644
--- a/sogo/locale/ar/fusiondirectory.po
+++ b/sogo/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/sogo/locale/ca/fusiondirectory.po b/sogo/locale/ca/fusiondirectory.po
index f6eaae92d13fa270b08603ab374896942cac5e05..6d8db5de78f5ddd07d96e7f04bece8c28d7dbcc1 100644
--- a/sogo/locale/ca/fusiondirectory.po
+++ b/sogo/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/cs_CZ/fusiondirectory.po b/sogo/locale/cs_CZ/fusiondirectory.po
index 374efc5a695684a7bfb2c387a29bc233a54069bc..7ca7bd2879066d493537ca5e99c7ca54d42f2b69 100644
--- a/sogo/locale/cs_CZ/fusiondirectory.po
+++ b/sogo/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/sogo/locale/de/fusiondirectory.po b/sogo/locale/de/fusiondirectory.po
index 54928c7f8b8bb62adcf05ae73a1e7d49b5cb7483..c3ec5fa6ab36b04849abd51e3e2698e6c3663511 100644
--- a/sogo/locale/de/fusiondirectory.po
+++ b/sogo/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/sogo/locale/el_GR/fusiondirectory.po b/sogo/locale/el_GR/fusiondirectory.po
index 9233c84a4b5612fbdf1472f93107c531786aabb7..7a6ef86d7c3106baa22fc70c4a62bfacea3845e0 100644
--- a/sogo/locale/el_GR/fusiondirectory.po
+++ b/sogo/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/sogo/locale/en/fusiondirectory.po b/sogo/locale/en/fusiondirectory.po
index 7c9034297ddae59f3452b917c404f28e57bbe240..df4245c4fa751e7b8721faf601302cca77cdcc4f 100644
--- a/sogo/locale/en/fusiondirectory.po
+++ b/sogo/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/sogo/locale/es/fusiondirectory.po b/sogo/locale/es/fusiondirectory.po
index 437b30dcaca2639aaa4591d3b347a33ebe6b4eb1..28fef6956903ef4891b3f8f7ace5301937604602 100644
--- a/sogo/locale/es/fusiondirectory.po
+++ b/sogo/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/sogo/locale/es_CO/fusiondirectory.po b/sogo/locale/es_CO/fusiondirectory.po
index a135e0c2b929abb67b0107bfca43b2ad2aae3b59..93efc92e3456de3d2d64d6afd5204ec653da6a77 100644
--- a/sogo/locale/es_CO/fusiondirectory.po
+++ b/sogo/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/sogo/locale/es_VE/fusiondirectory.po b/sogo/locale/es_VE/fusiondirectory.po
index c99ed416f704272445389c2eaaf890c0cb403408..d64ff157864956a5fcb024addcd94777bc348be9 100644
--- a/sogo/locale/es_VE/fusiondirectory.po
+++ b/sogo/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/sogo/locale/fa_IR/fusiondirectory.po b/sogo/locale/fa_IR/fusiondirectory.po
index 1a4154d9ba81c9f54138bc3e4138952e82f7c909..9ddae243cf4c4aac9e6f753007e0b9055292fcbd 100644
--- a/sogo/locale/fa_IR/fusiondirectory.po
+++ b/sogo/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/fi_FI/fusiondirectory.po b/sogo/locale/fi_FI/fusiondirectory.po
index f0eeb57c08805a581979dc48fb64e8c380d1ecef..105d79a998ee72bbe7bd00da7c01b194974d4dfc 100644
--- a/sogo/locale/fi_FI/fusiondirectory.po
+++ b/sogo/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/fr/fusiondirectory.po b/sogo/locale/fr/fusiondirectory.po
index d3448f12e025d58be470de2a701b74df60993df2..7c2689069a3eea74d1608ed2386ba9b1b0a1a817 100644
--- a/sogo/locale/fr/fusiondirectory.po
+++ b/sogo/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: config/sogo/class_sogoConfig.inc:28
 msgid "SOGo configuration"
-msgstr "Configuration de SOGo"
+msgstr "Configuration SOGo"
 
 #: config/sogo/class_sogoConfig.inc:29
 msgid "FusionDirectory sogo plugin configuration"
@@ -33,7 +33,7 @@ msgstr "SOGo"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "SOGo RDN"
-msgstr "SOGo RDN"
+msgstr "Branche SOGo"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "Branch in which SOGo objects will be stored"
@@ -54,7 +54,7 @@ msgstr "Nom du compte"
 
 #: admin/sogo/class_sogoResource.inc:61
 msgid "Mail"
-msgstr "Messagerie"
+msgstr "Courriel"
 
 #: admin/sogo/class_sogoResource.inc:67
 msgid "description"
@@ -62,7 +62,7 @@ msgstr "Description"
 
 #: admin/sogo/class_sogoResource.inc:71
 msgid "Multiplebookings"
-msgstr "Nombre réservation maximum"
+msgstr "Nombre de réservations maximum"
 
 #: admin/sogo/class_sogoResource.inc:76
 msgid "Kind"
diff --git a/sogo/locale/hu_HU/fusiondirectory.po b/sogo/locale/hu_HU/fusiondirectory.po
index b0dcda49a87339e5295df8af6c118fd3eaba5575..9ec6fbac721f2fb3552e95b09a11b87996671625 100644
--- a/sogo/locale/hu_HU/fusiondirectory.po
+++ b/sogo/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/id/fusiondirectory.po b/sogo/locale/id/fusiondirectory.po
index fac8ac9095cf94f262bd00b821daa06c0f294f66..9b0134f1f7d3cb555fb41619cc99fbecb8fd70d7 100644
--- a/sogo/locale/id/fusiondirectory.po
+++ b/sogo/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/it_IT/fusiondirectory.po b/sogo/locale/it_IT/fusiondirectory.po
index 4093ef50a1aec03778374578f09e599b688dd3e4..80f7fec0892a6467c0347164bdb9319ba87dd039 100644
--- a/sogo/locale/it_IT/fusiondirectory.po
+++ b/sogo/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/sogo/locale/lv/fusiondirectory.po b/sogo/locale/lv/fusiondirectory.po
index 68be44768cfb0fb180dfb223fda18de4a98c9982..a402b9218072422a022d39c8680ad55e6d1ee9ec 100644
--- a/sogo/locale/lv/fusiondirectory.po
+++ b/sogo/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/sogo/locale/nb/fusiondirectory.po b/sogo/locale/nb/fusiondirectory.po
index 52633ecd6c3b4f943c78b4d8536134b1735ef50a..c024f6eedb38ac310e4f483cb304b1489fe1963f 100644
--- a/sogo/locale/nb/fusiondirectory.po
+++ b/sogo/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/sogo/locale/nl/fusiondirectory.po b/sogo/locale/nl/fusiondirectory.po
index e70c2087a76430d406014bfff130070ac423b4bd..e68347614a49759e7646abd2f61afb71a60f1d94 100644
--- a/sogo/locale/nl/fusiondirectory.po
+++ b/sogo/locale/nl/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Joeri Puttevils <joeri.puttevils@connict.net>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: config/sogo/class_sogoConfig.inc:28
 msgid "SOGo configuration"
-msgstr "SOGo configuratie"
+msgstr "SOGo-configuratie"
 
 #: config/sogo/class_sogoConfig.inc:29
 msgid "FusionDirectory sogo plugin configuration"
-msgstr "FusionDirectory sogo plugin configuratie"
+msgstr "FusionDirectory SOGo plugin configuratie"
 
 #: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
 #: admin/sogo/class_sogoManagement.inc:38
@@ -33,24 +33,24 @@ msgstr "SOGo"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "SOGo RDN"
-msgstr "SoGo RDN"
+msgstr "SOGo RDN"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "Branch in which SOGo objects will be stored"
-msgstr ""
+msgstr "Tak waarin  SOGo-objecten zullen opgeslagen worden"
 
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
-msgstr ""
+msgstr "SOGo resource"
 
 #: admin/sogo/class_sogoResource.inc:57
 msgid "Entry name"
-msgstr "Naam inzending"
+msgstr "Naam item"
 
 #: admin/sogo/class_sogoResource.inc:57
 msgid "Account name"
-msgstr "Account naam"
+msgstr "Accountnaam"
 
 #: admin/sogo/class_sogoResource.inc:61
 msgid "Mail"
@@ -62,12 +62,12 @@ msgstr "beschrijving"
 
 #: admin/sogo/class_sogoResource.inc:71
 msgid "Multiplebookings"
-msgstr ""
+msgstr "Meerdere boekingen"
 
 #: admin/sogo/class_sogoResource.inc:76
 msgid "Kind"
-msgstr ""
+msgstr "Soort"
 
 #: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
-msgstr ""
+msgstr "SOGo-beheer"
diff --git a/sogo/locale/pl/fusiondirectory.po b/sogo/locale/pl/fusiondirectory.po
index c21c4f3d1b42a6c83a455bedfa34dbcd9fcdd2ac..79552766017dcb7e5ff00208ea5317c6e73fbb37 100644
--- a/sogo/locale/pl/fusiondirectory.po
+++ b/sogo/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/sogo/class_sogoConfig.inc:28
 msgid "SOGo configuration"
diff --git a/sogo/locale/pt/fusiondirectory.po b/sogo/locale/pt/fusiondirectory.po
index f6dea7f981ad20a366cb53c783e01f83257315f5..7ed031baf80c4791eb6cd7e792103f6e3bdd53aa 100644
--- a/sogo/locale/pt/fusiondirectory.po
+++ b/sogo/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/sogo/locale/pt_BR/fusiondirectory.po b/sogo/locale/pt_BR/fusiondirectory.po
index 4b9ebb3599405d32343c4e2c5fbe6afdf560193c..9562fc1a7ae26a986934ceb0dbc2812e97032603 100644
--- a/sogo/locale/pt_BR/fusiondirectory.po
+++ b/sogo/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/sogo/locale/ru/fusiondirectory.po b/sogo/locale/ru/fusiondirectory.po
index fe2f46255502d5f3b59a12f9f7fbf6f1ad4387d5..577b69e8891fdb7a011994a828bbc5fc673d0048 100644
--- a/sogo/locale/ru/fusiondirectory.po
+++ b/sogo/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/sogo/locale/ru@petr1708/fusiondirectory.po b/sogo/locale/ru@petr1708/fusiondirectory.po
index 321d8f78733f8207acfc2fc6ada5c88250bde0f8..d87ee3dda32f334840acf3831aaee0dde9db55c8 100644
--- a/sogo/locale/ru@petr1708/fusiondirectory.po
+++ b/sogo/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/sv/fusiondirectory.po b/sogo/locale/sv/fusiondirectory.po
index 5bb2a657cf6b062a7cd8413fdd2117902aff3281..a4d4bf33436fff504150e129229f03b7e6416155 100644
--- a/sogo/locale/sv/fusiondirectory.po
+++ b/sogo/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/sogo/locale/ug/fusiondirectory.po b/sogo/locale/ug/fusiondirectory.po
index 0f8083628f200a8db2b2ee96c9fac70baacfe6e1..315b00c0e98a341c80e7b17a2195c9d8b66a5be5 100644
--- a/sogo/locale/ug/fusiondirectory.po
+++ b/sogo/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/vi_VN/fusiondirectory.po b/sogo/locale/vi_VN/fusiondirectory.po
index 64f2bd595be7666a22d3232a4c79830e7182a8b1..4e6f3266632c9dab0ac2f7cac6faf3ff0e9648d5 100644
--- a/sogo/locale/vi_VN/fusiondirectory.po
+++ b/sogo/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/sogo/locale/zh/fusiondirectory.po b/sogo/locale/zh/fusiondirectory.po
index 0882e6586ee5ba2f51324b24130cc59026463651..7e20cf5c5cee5f7cb7fb2f17aa6f28b87bb14d05 100644
--- a/sogo/locale/zh/fusiondirectory.po
+++ b/sogo/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/spamassassin/locale/ar/fusiondirectory.po b/spamassassin/locale/ar/fusiondirectory.po
index 809ec76200f38348388e3bd70e7a6d9b80594e9b..0fb5352e2b121d7f5fb410c411a1e41ae6a7c61e 100644
--- a/spamassassin/locale/ar/fusiondirectory.po
+++ b/spamassassin/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/spamassassin/locale/ca/fusiondirectory.po b/spamassassin/locale/ca/fusiondirectory.po
index 627217c8ed62bc0be9c266988916d587eb3665fb..e7ec3c4898933a05ead5d53d4b09e4e719a30782 100644
--- a/spamassassin/locale/ca/fusiondirectory.po
+++ b/spamassassin/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/spamassassin/locale/cs_CZ/fusiondirectory.po b/spamassassin/locale/cs_CZ/fusiondirectory.po
index 4ea34384366a6ef1e07558bf2eeef817f742bc4e..b05d42c3beceaffd297d3b3b612ce5be54e35e94 100644
--- a/spamassassin/locale/cs_CZ/fusiondirectory.po
+++ b/spamassassin/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/spamassassin/locale/de/fusiondirectory.po b/spamassassin/locale/de/fusiondirectory.po
index ca569fa3b1c17c8e3f49c6bc5a3f3dcfb2e12d90..bde656e2b5884f91240b59a24ff160bc38876935 100644
--- a/spamassassin/locale/de/fusiondirectory.po
+++ b/spamassassin/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/spamassassin/locale/el_GR/fusiondirectory.po b/spamassassin/locale/el_GR/fusiondirectory.po
index 56f62d3e7e5005895495baf5d52a783fd800b5f0..fdc5a37b115971f210761d8c3e9cdd92da91213b 100644
--- a/spamassassin/locale/el_GR/fusiondirectory.po
+++ b/spamassassin/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/spamassassin/locale/en/fusiondirectory.po b/spamassassin/locale/en/fusiondirectory.po
index 1982e6ddf449c32c57ce70603bceed9766342884..9d711f57f8f695d472971dd0eed147041666a380 100644
--- a/spamassassin/locale/en/fusiondirectory.po
+++ b/spamassassin/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/spamassassin/locale/es/fusiondirectory.po b/spamassassin/locale/es/fusiondirectory.po
index be68212ca9e4431b5e134a1e493c842dced50b62..de18bb5ee13ee13f2b77022dcbceff342eb7a382 100644
--- a/spamassassin/locale/es/fusiondirectory.po
+++ b/spamassassin/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/spamassassin/locale/es_CO/fusiondirectory.po b/spamassassin/locale/es_CO/fusiondirectory.po
index 93b1a8786b629d773ab0d1310cb07af04f93b6d3..9d02ba8c4a2efcd4ade28cbb3a13c9dd4b867118 100644
--- a/spamassassin/locale/es_CO/fusiondirectory.po
+++ b/spamassassin/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/spamassassin/locale/es_VE/fusiondirectory.po b/spamassassin/locale/es_VE/fusiondirectory.po
index 98d4753e572d954fad7076d5cc26ecd95fe33f2d..ea86c99530cf32c9d869ff8d41ad1b368f03091c 100644
--- a/spamassassin/locale/es_VE/fusiondirectory.po
+++ b/spamassassin/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/spamassassin/locale/fa_IR/fusiondirectory.po b/spamassassin/locale/fa_IR/fusiondirectory.po
index 43e22199cb6db23c0d72931c0531284e8feacf66..3cc1cf3b5006f93956323aca4da053f6cd2488f0 100644
--- a/spamassassin/locale/fa_IR/fusiondirectory.po
+++ b/spamassassin/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/fi_FI/fusiondirectory.po b/spamassassin/locale/fi_FI/fusiondirectory.po
index 6f207197c25ed5c2c4d8cebdcbe5f7386c74cbbb..26a91785a33881b0961f626da24449006f0df8a7 100644
--- a/spamassassin/locale/fi_FI/fusiondirectory.po
+++ b/spamassassin/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/spamassassin/locale/fr/fusiondirectory.po b/spamassassin/locale/fr/fusiondirectory.po
index d11148bb714c1d8b22d958eaaa2da14546751a28..4623a7144b58b9b074ff1f28129bc301a8d22e92 100644
--- a/spamassassin/locale/fr/fusiondirectory.po
+++ b/spamassassin/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/spamassassin/locale/hu_HU/fusiondirectory.po b/spamassassin/locale/hu_HU/fusiondirectory.po
index 8f8c7de06d9b73fbd125bba2619a61b5e0449d1c..a803fab5b75425f2eea80e03788e291729f163d1 100644
--- a/spamassassin/locale/hu_HU/fusiondirectory.po
+++ b/spamassassin/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/spamassassin/locale/id/fusiondirectory.po b/spamassassin/locale/id/fusiondirectory.po
index 235c39bab5450cbbca985287f222e7f8d9044326..5139fad4571ac3d54111b575375fc0734ddea0d8 100644
--- a/spamassassin/locale/id/fusiondirectory.po
+++ b/spamassassin/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/it_IT/fusiondirectory.po b/spamassassin/locale/it_IT/fusiondirectory.po
index b0606c78dcbfce99f6dc7799499024eb43c845d8..bcdfd62ab27a0718fb5e602f08f77ccd81b58ebc 100644
--- a/spamassassin/locale/it_IT/fusiondirectory.po
+++ b/spamassassin/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/spamassassin/locale/lv/fusiondirectory.po b/spamassassin/locale/lv/fusiondirectory.po
index ceba7c1cfea75cacb1f6d99fb38c9132359ee553..334a567dd96321ba0feee5d21fc8ac960105e6c3 100644
--- a/spamassassin/locale/lv/fusiondirectory.po
+++ b/spamassassin/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/spamassassin/locale/nb/fusiondirectory.po b/spamassassin/locale/nb/fusiondirectory.po
index 89bda2f5c19f69238a7dfb45ebfc316cd5b1340c..b8694ae74a439cc98f6c7cd9ad645b342fde1402 100644
--- a/spamassassin/locale/nb/fusiondirectory.po
+++ b/spamassassin/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/spamassassin/locale/nl/fusiondirectory.po b/spamassassin/locale/nl/fusiondirectory.po
index 006a8530e9c2295f4146718dd0d58f8916831b9e..6908c0e434f7d0c7ef091ce8eda7b30f88eb0d32 100644
--- a/spamassassin/locale/nl/fusiondirectory.po
+++ b/spamassassin/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/spamassassin/locale/pl/fusiondirectory.po b/spamassassin/locale/pl/fusiondirectory.po
index 6741e720166be83843112d99e56d3ea16341e6d5..71928dbc31f354432752ea3ebf2d79e9bb19ab66 100644
--- a/spamassassin/locale/pl/fusiondirectory.po
+++ b/spamassassin/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/spamassassin/class_spamAssassinAccount.inc:31
 msgid "Spam rules"
diff --git a/spamassassin/locale/pt/fusiondirectory.po b/spamassassin/locale/pt/fusiondirectory.po
index cc9af736d96861ec9ad992a77d97fadab0d3b617..5b89266e82e2483eaf1731e4fd10734f90217f1b 100644
--- a/spamassassin/locale/pt/fusiondirectory.po
+++ b/spamassassin/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/spamassassin/locale/pt_BR/fusiondirectory.po b/spamassassin/locale/pt_BR/fusiondirectory.po
index 3f2c68c3b29bb46976cc11952d834e94b62f8afc..53bc58c393d92429355cc4a74c90d6af98036b64 100644
--- a/spamassassin/locale/pt_BR/fusiondirectory.po
+++ b/spamassassin/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/spamassassin/locale/ru/fusiondirectory.po b/spamassassin/locale/ru/fusiondirectory.po
index e4015eb7f4b970b6bc3bcf1b056df2a78936a694..35962a64a7b1b7fcaf7598dba7ccad34da89e72c 100644
--- a/spamassassin/locale/ru/fusiondirectory.po
+++ b/spamassassin/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/spamassassin/locale/ru@petr1708/fusiondirectory.po b/spamassassin/locale/ru@petr1708/fusiondirectory.po
index 3665e7f7e444276b3f74e67787436be1dbb6df2b..0aefe953aa6d92e3889b4ae21ee5e5ccb014b9bc 100644
--- a/spamassassin/locale/ru@petr1708/fusiondirectory.po
+++ b/spamassassin/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/sv/fusiondirectory.po b/spamassassin/locale/sv/fusiondirectory.po
index 5e98c364147d648302623f6052b657478ad829a7..5564db4e070a4156a6494a1750dea33065e08c0d 100644
--- a/spamassassin/locale/sv/fusiondirectory.po
+++ b/spamassassin/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/spamassassin/locale/ug/fusiondirectory.po b/spamassassin/locale/ug/fusiondirectory.po
index d72ce0c1eccd36671465389da9e31d7320e305f3..bf8ecae24fe1eec096df8557b094db62644f4cde 100644
--- a/spamassassin/locale/ug/fusiondirectory.po
+++ b/spamassassin/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/vi_VN/fusiondirectory.po b/spamassassin/locale/vi_VN/fusiondirectory.po
index f70621d40aa85a579878dc68b4e019f8ca675eda..c529844c08c2eaaaf41717ad2a0472e1d17d8655 100644
--- a/spamassassin/locale/vi_VN/fusiondirectory.po
+++ b/spamassassin/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/spamassassin/locale/zh/fusiondirectory.po b/spamassassin/locale/zh/fusiondirectory.po
index 77143b29040882e04a514860271afbb57facea1b..d91672c3a843cc2ed8d05f570b2b0df96dabd7f1 100644
--- a/spamassassin/locale/zh/fusiondirectory.po
+++ b/spamassassin/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/squid/locale/ar/fusiondirectory.po b/squid/locale/ar/fusiondirectory.po
index 2b58fb4b009a8edc2177a2b0d2d018e9a52bde1e..34e1739dd307d8900281ef92de853544cb348a5f 100644
--- a/squid/locale/ar/fusiondirectory.po
+++ b/squid/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/squid/locale/ca/fusiondirectory.po b/squid/locale/ca/fusiondirectory.po
index 1d6f7e147bce642d9f857771b4f3d73811b6dbd5..8841b10fbd22d0f40d2f14b461f6e1d52e0ad88b 100644
--- a/squid/locale/ca/fusiondirectory.po
+++ b/squid/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/squid/locale/cs_CZ/fusiondirectory.po b/squid/locale/cs_CZ/fusiondirectory.po
index beacd014d27db034d6cc5756ae4b90206aed3b6c..b4b803a063fb92772fdb17929ecf8cf0c4eb9be1 100644
--- a/squid/locale/cs_CZ/fusiondirectory.po
+++ b/squid/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/squid/locale/de/fusiondirectory.po b/squid/locale/de/fusiondirectory.po
index 46940460a82296fb33a5341dd0a2cca24e532ec3..51e99a7a7afe459ab8e41414d06543c0abff783a 100644
--- a/squid/locale/de/fusiondirectory.po
+++ b/squid/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/squid/locale/el_GR/fusiondirectory.po b/squid/locale/el_GR/fusiondirectory.po
index 74516dd2761919a9a386aea9aa506fd92fe2d556..ee44bc02513c10c030e63b5d6163cc600db0abc4 100644
--- a/squid/locale/el_GR/fusiondirectory.po
+++ b/squid/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/squid/locale/en/fusiondirectory.po b/squid/locale/en/fusiondirectory.po
index a71caa40340ea24a0ad56bb7c0fe9dd67ef8bac9..7659f415b5bcc8dc81fdc340fa9018a27a256b80 100644
--- a/squid/locale/en/fusiondirectory.po
+++ b/squid/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/squid/locale/es/fusiondirectory.po b/squid/locale/es/fusiondirectory.po
index 2e44eab06237fd93ebe747299dc9310d55aa96ea..6d7e7823b6112231c27a991a427f8897ebc66bd4 100644
--- a/squid/locale/es/fusiondirectory.po
+++ b/squid/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/squid/locale/es_CO/fusiondirectory.po b/squid/locale/es_CO/fusiondirectory.po
index dc1e4c5a5918d610526ab0187aa001a7a52a32d3..d8f4de8b00c0355d709c76adcf832fa0085f154f 100644
--- a/squid/locale/es_CO/fusiondirectory.po
+++ b/squid/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/squid/locale/es_VE/fusiondirectory.po b/squid/locale/es_VE/fusiondirectory.po
index 9fe4af1f8220977bc6ba4888baa605b93c69b978..8c4f8835272e3c41aef22010664e315c6b87bc87 100644
--- a/squid/locale/es_VE/fusiondirectory.po
+++ b/squid/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/squid/locale/fa_IR/fusiondirectory.po b/squid/locale/fa_IR/fusiondirectory.po
index 7546c519a70e5d819583c730fbe0f9acc9efddcc..477f7f63d581863aa92c9c00926d7cd1eafc1634 100644
--- a/squid/locale/fa_IR/fusiondirectory.po
+++ b/squid/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/fi_FI/fusiondirectory.po b/squid/locale/fi_FI/fusiondirectory.po
index ea5be24d2cf57005ded0f7cdf02941ea8ae5bc3a..a92d650c4d758b52af472c877058b8ca09af77b7 100644
--- a/squid/locale/fi_FI/fusiondirectory.po
+++ b/squid/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/fr/fusiondirectory.po b/squid/locale/fr/fusiondirectory.po
index 8fdbfbf88a80a552c7eccdba93c8ea3aa3d6c720..74cb9b56cbb39237fdaf766263e5e6d8a8b088cc 100644
--- a/squid/locale/fr/fusiondirectory.po
+++ b/squid/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/squid/locale/hu_HU/fusiondirectory.po b/squid/locale/hu_HU/fusiondirectory.po
index 25e029a4e6e1e129b683947b3d92fd536aee0153..bb786111b202f09816f71990fd2dac1f2d1efd7c 100644
--- a/squid/locale/hu_HU/fusiondirectory.po
+++ b/squid/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/id/fusiondirectory.po b/squid/locale/id/fusiondirectory.po
index 7b174e017f16198865bbd3efc888dc9bd508f58f..bc0dcf0d48ff7dbf75f16c8e0b065c5b2b19d94c 100644
--- a/squid/locale/id/fusiondirectory.po
+++ b/squid/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/it_IT/fusiondirectory.po b/squid/locale/it_IT/fusiondirectory.po
index eeee8e6af1bd916ca6ecaac75128ca63ee2b0a7f..542041a4d0f0ba70315d8ecb3550ad2583b5c026 100644
--- a/squid/locale/it_IT/fusiondirectory.po
+++ b/squid/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/squid/locale/lv/fusiondirectory.po b/squid/locale/lv/fusiondirectory.po
index 3e65af9e288cce4a0f028a19a4e8ec6adad620d5..948420844480c40bd4ef55314e00920228c9f98c 100644
--- a/squid/locale/lv/fusiondirectory.po
+++ b/squid/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/nb/fusiondirectory.po b/squid/locale/nb/fusiondirectory.po
index 0ec47101483933176cd0b1d8dbee547a1548e02e..a5406008696bf0ed5505dea361d5bf60cebbddbf 100644
--- a/squid/locale/nb/fusiondirectory.po
+++ b/squid/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/nl/fusiondirectory.po b/squid/locale/nl/fusiondirectory.po
index f842d0d8aeea3ea4888e65257654fd60ec949c9e..a5f7bc791cb46aa890ff3a0da71e19abc272bf57 100644
--- a/squid/locale/nl/fusiondirectory.po
+++ b/squid/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/squid/locale/pl/fusiondirectory.po b/squid/locale/pl/fusiondirectory.po
index 929c24db1d85c7c8011f565105da59cc55dd7d20..5719eb29d57f89ce8e908099153f54b1cd9919f7 100644
--- a/squid/locale/pl/fusiondirectory.po
+++ b/squid/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/squid/class_proxyAccount.inc:65
 msgid "Proxy"
diff --git a/squid/locale/pt/fusiondirectory.po b/squid/locale/pt/fusiondirectory.po
index 06cf96d13c2ea47e7cd48cf71e8d3437f1f97407..04cc8f1f86ca4ffb65db0477f024f4d1b1b0503c 100644
--- a/squid/locale/pt/fusiondirectory.po
+++ b/squid/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/squid/locale/pt_BR/fusiondirectory.po b/squid/locale/pt_BR/fusiondirectory.po
index 482d74af482d1b0c0c346327d2c7e1f3060a907a..fe38ab7f7b273da910c7304863e68a9d4a999e4b 100644
--- a/squid/locale/pt_BR/fusiondirectory.po
+++ b/squid/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/squid/locale/ru/fusiondirectory.po b/squid/locale/ru/fusiondirectory.po
index 431f82f37eb272e61db8ade82efdfb60e6bd778c..90b2ef503bd962438aa9a44764908c600fc495c7 100644
--- a/squid/locale/ru/fusiondirectory.po
+++ b/squid/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/squid/locale/ru@petr1708/fusiondirectory.po b/squid/locale/ru@petr1708/fusiondirectory.po
index b36a11d583f52a2f220ebb20df71dea805498f18..808fefa35fa7b852b414f1d9af28a9f9b8f52023 100644
--- a/squid/locale/ru@petr1708/fusiondirectory.po
+++ b/squid/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/sv/fusiondirectory.po b/squid/locale/sv/fusiondirectory.po
index fff78fb5429843727d88a5b80d0a65fe7500bf74..a4c121f14781479f4fceb415379f4cd3043a44d1 100644
--- a/squid/locale/sv/fusiondirectory.po
+++ b/squid/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/squid/locale/ug/fusiondirectory.po b/squid/locale/ug/fusiondirectory.po
index d7b85959699c39d0ff2098f935868802c7d79e5d..5b3d7ff8a3615785b21499e377c0839ff12b6bd3 100644
--- a/squid/locale/ug/fusiondirectory.po
+++ b/squid/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/vi_VN/fusiondirectory.po b/squid/locale/vi_VN/fusiondirectory.po
index 30f49a507256b4bddcf328ec6d8459fabece4531..dc5635da93bfd2b09e40198269167f5982051c89 100644
--- a/squid/locale/vi_VN/fusiondirectory.po
+++ b/squid/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/squid/locale/zh/fusiondirectory.po b/squid/locale/zh/fusiondirectory.po
index 5692db3bdd85b8ab95b7f186f71e55e5a5144b43..435bf318a5d7152c6ad93ea3a5aee2958574b0f6 100644
--- a/squid/locale/zh/fusiondirectory.po
+++ b/squid/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/ssh/locale/ar/fusiondirectory.po b/ssh/locale/ar/fusiondirectory.po
index ccff6481c783a504ada7d19a4a4d80ff005f1dd8..88f63730af6e587a41ebe099cd3c0579928c7331 100644
--- a/ssh/locale/ar/fusiondirectory.po
+++ b/ssh/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/ssh/locale/ca/fusiondirectory.po b/ssh/locale/ca/fusiondirectory.po
index 6c7896f6f4332f44161caca40e37a92cb7ae27f0..e04589fb2a5f3cea4e9a0e90dac9c71cc6ff79c7 100644
--- a/ssh/locale/ca/fusiondirectory.po
+++ b/ssh/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/cs_CZ/fusiondirectory.po b/ssh/locale/cs_CZ/fusiondirectory.po
index 9bf7fb847bbaa4d551f47dc6b4f533de05d953be..218370e471adc00b790ad1835a9fc5a4f03f83f1 100644
--- a/ssh/locale/cs_CZ/fusiondirectory.po
+++ b/ssh/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/ssh/locale/de/fusiondirectory.po b/ssh/locale/de/fusiondirectory.po
index deb08fc660b32daa28fbb92c156dd3fd1af22121..0a8f1d3f8dc47b2322f03d1720de9fb4930f6c13 100644
--- a/ssh/locale/de/fusiondirectory.po
+++ b/ssh/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/ssh/locale/el_GR/fusiondirectory.po b/ssh/locale/el_GR/fusiondirectory.po
index a2baa6f1a2282a570b05d034000f5dfb922a57c4..af0315d31ca573b0a7c806663e5a02b9ddc1cb5d 100644
--- a/ssh/locale/el_GR/fusiondirectory.po
+++ b/ssh/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/ssh/locale/en/fusiondirectory.po b/ssh/locale/en/fusiondirectory.po
index 9e3ac5eb94b9534beeb3367bac177226baff9cf1..27d443809f4120e5f454d7eab904b511a16e6d90 100644
--- a/ssh/locale/en/fusiondirectory.po
+++ b/ssh/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ssh/locale/es/fusiondirectory.po b/ssh/locale/es/fusiondirectory.po
index a1e241ee426b8c4842d22a0d41099cf600c956bd..f49a65394ce0ce1da0a9b532e6d5962e7280c58c 100644
--- a/ssh/locale/es/fusiondirectory.po
+++ b/ssh/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/ssh/locale/es_CO/fusiondirectory.po b/ssh/locale/es_CO/fusiondirectory.po
index 8c7f159f7ffba743d7f9078ef6e6e34ba39622dd..08db7ed7cdca364ee733a253766c006d46049c22 100644
--- a/ssh/locale/es_CO/fusiondirectory.po
+++ b/ssh/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/es_VE/fusiondirectory.po b/ssh/locale/es_VE/fusiondirectory.po
index 6013a36c036cd5f728e8f1b1f0c9d8d411dc7265..f01b67506f5c8b1a7f4b9ece67ce8515302831ad 100644
--- a/ssh/locale/es_VE/fusiondirectory.po
+++ b/ssh/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/ssh/locale/fa_IR/fusiondirectory.po b/ssh/locale/fa_IR/fusiondirectory.po
index 36936db7e048d157f3668e6d4565b1b0d6a60f68..fff607de44c4d0e51d918d40da282752e1fd263c 100644
--- a/ssh/locale/fa_IR/fusiondirectory.po
+++ b/ssh/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/fi_FI/fusiondirectory.po b/ssh/locale/fi_FI/fusiondirectory.po
index c52dcea228345529a9270eaea33e43bbbde5e99a..a16715e72ddfb01624955719ccc905bb2387d7e4 100644
--- a/ssh/locale/fi_FI/fusiondirectory.po
+++ b/ssh/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/fr/fusiondirectory.po b/ssh/locale/fr/fusiondirectory.po
index caf70c9136509601034dd38d366f6bd9dfd24f9d..ca32d446f0851b3086909021777a218550507e47 100644
--- a/ssh/locale/fr/fusiondirectory.po
+++ b/ssh/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/ssh/locale/hu_HU/fusiondirectory.po b/ssh/locale/hu_HU/fusiondirectory.po
index 85ed3fa7a443d01e73b373058b3c797568891b86..7e89e8bd29aba299b67d33d7b6c43c9f76f9e8f6 100644
--- a/ssh/locale/hu_HU/fusiondirectory.po
+++ b/ssh/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/id/fusiondirectory.po b/ssh/locale/id/fusiondirectory.po
index 48f32e8bd328773039e023330b2fbf6fcc1657cb..0f4998c5982e34f0ed4c06aa40ed36ed7b440e40 100644
--- a/ssh/locale/id/fusiondirectory.po
+++ b/ssh/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/it_IT/fusiondirectory.po b/ssh/locale/it_IT/fusiondirectory.po
index 89d7c80b8c343759e055b2f639eb12aa7eedd393..f957220f0191c458e5b7eac9404330fa36201e71 100644
--- a/ssh/locale/it_IT/fusiondirectory.po
+++ b/ssh/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ssh/locale/lv/fusiondirectory.po b/ssh/locale/lv/fusiondirectory.po
index 1e8ff9c11d4f380a9d13b33475d28184f88a6a45..78127cf89cb0306d5cd2f927cd63c385f8df9cde 100644
--- a/ssh/locale/lv/fusiondirectory.po
+++ b/ssh/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/nb/fusiondirectory.po b/ssh/locale/nb/fusiondirectory.po
index 32a0c8d284ac163f470ee0f00adf37a7a49c660f..642c91687be2bf9c4633f7eb4bfef2b2bd0a2d03 100644
--- a/ssh/locale/nb/fusiondirectory.po
+++ b/ssh/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/nl/fusiondirectory.po b/ssh/locale/nl/fusiondirectory.po
index 9281c9cb8045c11a57c2c13c2c562d826edd62f5..a5c5b5c623959794a598949797ccf741b8366322 100644
--- a/ssh/locale/nl/fusiondirectory.po
+++ b/ssh/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ssh/locale/pl/fusiondirectory.po b/ssh/locale/pl/fusiondirectory.po
index fbf3fc16f65866b30bb041a5d528de9fe1c1c037..d0adb77279c0aa666bfabc10001b8f5334984143 100644
--- a/ssh/locale/pl/fusiondirectory.po
+++ b/ssh/locale/pl/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/ssh/class_sshAccount.inc:58
 msgid "Upload error"
diff --git a/ssh/locale/pt/fusiondirectory.po b/ssh/locale/pt/fusiondirectory.po
index 47f235852d85278f9207460b819829cb8cc90362..fddeb73021f0953da1161b007c7bac7f468fd530 100644
--- a/ssh/locale/pt/fusiondirectory.po
+++ b/ssh/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/pt_BR/fusiondirectory.po b/ssh/locale/pt_BR/fusiondirectory.po
index 5a1ea698fb745c1af1a842630a2711ae44d1600c..708463d2f0b8fb0becc36bea643562807a87cd91 100644
--- a/ssh/locale/pt_BR/fusiondirectory.po
+++ b/ssh/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/ssh/locale/ru/fusiondirectory.po b/ssh/locale/ru/fusiondirectory.po
index 32aafb0f4f8a71a0d088d27cee6ddb3cbb239cf6..52619102ceed66d1cad208dbbdc6e09b54ec8d2c 100644
--- a/ssh/locale/ru/fusiondirectory.po
+++ b/ssh/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/ssh/locale/ru@petr1708/fusiondirectory.po b/ssh/locale/ru@petr1708/fusiondirectory.po
index 0d45a67b4427146878c78e6cc0e180b619a8f831..af3f4da4f6804fd0af4b02f62964a2dd5e759f08 100644
--- a/ssh/locale/ru@petr1708/fusiondirectory.po
+++ b/ssh/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/sv/fusiondirectory.po b/ssh/locale/sv/fusiondirectory.po
index 0c830e1f69245443ad2bf4a8f7e20e6cf019e08d..88d36b93368683494de5a175770e9e0a33c85064 100644
--- a/ssh/locale/sv/fusiondirectory.po
+++ b/ssh/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/ug/fusiondirectory.po b/ssh/locale/ug/fusiondirectory.po
index 64511fe3b10dfdc1de4c9a332c44bd2121a3b461..4ccf41693482db55208d4dd828e1337f2947c371 100644
--- a/ssh/locale/ug/fusiondirectory.po
+++ b/ssh/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/vi_VN/fusiondirectory.po b/ssh/locale/vi_VN/fusiondirectory.po
index dde5b97c9e7beb3b7a7df03c1083f7aab7988695..76bb9d930cc10e1415b07efb41558a2c7421d90c 100644
--- a/ssh/locale/vi_VN/fusiondirectory.po
+++ b/ssh/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/zh/fusiondirectory.po b/ssh/locale/zh/fusiondirectory.po
index 154cdfadf98ab7c6c5c31ab5277fcbc0c6723347..12786e7d46dd6c8eafe3dab281e7f923eed619f7 100644
--- a/ssh/locale/zh/fusiondirectory.po
+++ b/ssh/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/ar/fusiondirectory.po b/subcontracting/locale/ar/fusiondirectory.po
index 7f86ca8edcf70260c46ee06da9a81a73c2a04c39..84fdb0b8119dd95dd5dc8ed9d5693b989000ac9f 100644
--- a/subcontracting/locale/ar/fusiondirectory.po
+++ b/subcontracting/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/subcontracting/locale/ca/fusiondirectory.po b/subcontracting/locale/ca/fusiondirectory.po
index 9003365d6ae2f14ebfa49602307c3320f50908e1..93fe2186bebff49a0b5ddb7cea421197e7fb0a60 100644
--- a/subcontracting/locale/ca/fusiondirectory.po
+++ b/subcontracting/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/subcontracting/locale/cs_CZ/fusiondirectory.po b/subcontracting/locale/cs_CZ/fusiondirectory.po
index cac061c8221948cacae5c512f510457ff7b1971b..74a3753d328b44955d1e56db3695a70b0ea984d1 100644
--- a/subcontracting/locale/cs_CZ/fusiondirectory.po
+++ b/subcontracting/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/subcontracting/locale/de/fusiondirectory.po b/subcontracting/locale/de/fusiondirectory.po
index 92914f7f5033c9c2fbb82b8c0b697acc6861c432..156437a40c39df74fd8c985d51c1e628ae987490 100644
--- a/subcontracting/locale/de/fusiondirectory.po
+++ b/subcontracting/locale/de/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: d.oertel <d.oertel@uib.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,15 @@ msgstr ""
 
 #: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
-msgstr ""
+msgstr "Unterverträge"
 
 #: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
-msgstr ""
+msgstr "Benötigte Informationen für Unterverträge"
 
 #: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
-msgstr ""
+msgstr "Untervertragsinformationen"
 
 #: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
@@ -36,23 +36,23 @@ msgstr ""
 
 #: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
-msgstr ""
+msgstr "Kontakt zum Endkunden"
 
 #: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
-msgstr ""
+msgstr "Endkunde"
 
 #: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
-msgstr ""
+msgstr "Endkunde für diese Aufgabe"
 
 #: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
-msgstr ""
+msgstr "Mailadresse"
 
 #: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
-msgstr ""
+msgstr "Mailadresse für diese Aufgabe"
 
 #: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
@@ -60,12 +60,12 @@ msgstr "Telefon"
 
 #: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
-msgstr ""
+msgstr "Telefonnummer für diese Aufgabe"
 
 #: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
-msgstr ""
+msgstr "Strasse"
 
 #: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
-msgstr ""
+msgstr "Ausführungsort (Adresse)"
diff --git a/subcontracting/locale/el_GR/fusiondirectory.po b/subcontracting/locale/el_GR/fusiondirectory.po
index 3bfe4b1060ecf14037434aca32f02103f86f3477..a4717eb53a25af062c5ec15119f51f42f7780f44 100644
--- a/subcontracting/locale/el_GR/fusiondirectory.po
+++ b/subcontracting/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/subcontracting/locale/en/fusiondirectory.po b/subcontracting/locale/en/fusiondirectory.po
index 58d1513d09bde5f934635a1769d0eb96658422f0..bd057c37d028050c3f63f7e17c36c49cf3a42900 100644
--- a/subcontracting/locale/en/fusiondirectory.po
+++ b/subcontracting/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/subcontracting/locale/es/fusiondirectory.po b/subcontracting/locale/es/fusiondirectory.po
index 7b12e46656bb62f35ce1213e628d6aeca1b49010..f764786d4c6c3625e127c19fadc2b571c37f87b6 100644
--- a/subcontracting/locale/es/fusiondirectory.po
+++ b/subcontracting/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/subcontracting/locale/es_CO/fusiondirectory.po b/subcontracting/locale/es_CO/fusiondirectory.po
index 005fe4969d87675c598ca0e7b719788828e5001b..9b1e0869aba2c3324c8b32097a8212f82690d7c2 100644
--- a/subcontracting/locale/es_CO/fusiondirectory.po
+++ b/subcontracting/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/subcontracting/locale/es_VE/fusiondirectory.po b/subcontracting/locale/es_VE/fusiondirectory.po
index 0b36f680c8ec05ecaf3a3ef02e1e7504047425f0..b48c30913ae71799422d6b258564331a82ec5037 100644
--- a/subcontracting/locale/es_VE/fusiondirectory.po
+++ b/subcontracting/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/subcontracting/locale/fa_IR/fusiondirectory.po b/subcontracting/locale/fa_IR/fusiondirectory.po
index 9a3367687b190afd850c6bb9ce3a66dacbb38bb4..c00988dc3e6b41b721e601abba18dd6568b3e7a3 100644
--- a/subcontracting/locale/fa_IR/fusiondirectory.po
+++ b/subcontracting/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/subcontracting/locale/fi_FI/fusiondirectory.po b/subcontracting/locale/fi_FI/fusiondirectory.po
index b3c47728152afde68d25b720699059cd47aedad9..ea7e1f3c7b7ed922ab78d480fb7b72b73f538aee 100644
--- a/subcontracting/locale/fi_FI/fusiondirectory.po
+++ b/subcontracting/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/subcontracting/locale/fr/fusiondirectory.po b/subcontracting/locale/fr/fusiondirectory.po
index 36cf2aab78d06c59b92c5b0a41f4462743ed4642..9abc6f32c9a1d3f8ae32e88b0693f2f0ba6d5d46 100644
--- a/subcontracting/locale/fr/fusiondirectory.po
+++ b/subcontracting/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/subcontracting/locale/hu_HU/fusiondirectory.po b/subcontracting/locale/hu_HU/fusiondirectory.po
index 207154aa97968dc335f1d7e5694e34ce8002435b..dc2d4de41a5b8d20b5cf6a3abddac3bd9b04e666 100644
--- a/subcontracting/locale/hu_HU/fusiondirectory.po
+++ b/subcontracting/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/id/fusiondirectory.po b/subcontracting/locale/id/fusiondirectory.po
index 61bdb03422aab1aff14c98471a161592a59592bf..d869d438b9793ee1449a2aad1ec0e47501ec52de 100644
--- a/subcontracting/locale/id/fusiondirectory.po
+++ b/subcontracting/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/it_IT/fusiondirectory.po b/subcontracting/locale/it_IT/fusiondirectory.po
index 3331e1395dad7f93456c681d5989b5283cdeba77..b61149d4aa9b677c522fc2138af452b86d1dcafd 100644
--- a/subcontracting/locale/it_IT/fusiondirectory.po
+++ b/subcontracting/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/subcontracting/locale/lv/fusiondirectory.po b/subcontracting/locale/lv/fusiondirectory.po
index cca30d29a760cffa0eb376ea2974625b2beb4d3c..0a627e63ed394b450002f971a35fc2779a39fbe6 100644
--- a/subcontracting/locale/lv/fusiondirectory.po
+++ b/subcontracting/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/subcontracting/locale/nb/fusiondirectory.po b/subcontracting/locale/nb/fusiondirectory.po
index 8441852b49a6f6e4f7694f333e391a9b182c24d9..71590a60d001f0946db2fd5d635bcc18de512a53 100644
--- a/subcontracting/locale/nb/fusiondirectory.po
+++ b/subcontracting/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/nl/fusiondirectory.po b/subcontracting/locale/nl/fusiondirectory.po
index 3c611fa9c669041a017aa9f89b1d5a3edebef478..b391976611e9030dc991aec33a25dc0ee3fb4041 100644
--- a/subcontracting/locale/nl/fusiondirectory.po
+++ b/subcontracting/locale/nl/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Joeri Puttevils <joeri.puttevils@connict.net>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,19 @@ msgstr ""
 
 #: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
-msgstr ""
+msgstr "Uitbesteding"
 
 #: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
-msgstr ""
+msgstr "Benodigde informatie voor uitbestedingscontracten"
 
 #: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
-msgstr ""
+msgstr "Uitbestedingsinformatie"
 
 #: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
-msgstr ""
+msgstr "Intermediair"
 
 #: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
@@ -40,19 +40,19 @@ msgstr ""
 
 #: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
-msgstr "Uiteindelijke klant"
+msgstr "Eindklant"
 
 #: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
-msgstr ""
+msgstr "Eindklant voor deze opdracht"
 
 #: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
-msgstr "E-mail adres"
+msgstr "E-mailadres"
 
 #: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
-msgstr ""
+msgstr "E-mailadres toegewezen aan deze opdracht"
 
 #: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
@@ -60,12 +60,12 @@ msgstr "Telefoon"
 
 #: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
-msgstr ""
+msgstr "Telefoonnummer toegewezen aan deze opdracht"
 
 #: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
-msgstr "Woonadres"
+msgstr "adres"
 
 #: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
-msgstr ""
+msgstr "Adres waar deze opdracht uitgevoerd is"
diff --git a/subcontracting/locale/pl/fusiondirectory.po b/subcontracting/locale/pl/fusiondirectory.po
index dc94bbfc1f24b316bfa864d9f303ede732591e3e..314c123646c9b2e0ade4e1a9c8e0fa0f837da2ea 100644
--- a/subcontracting/locale/pl/fusiondirectory.po
+++ b/subcontracting/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
diff --git a/subcontracting/locale/pt/fusiondirectory.po b/subcontracting/locale/pt/fusiondirectory.po
index 1413a4f42e1bd070d3c6bedae7b296dd3643c7ae..250d13ae2ccdd79420162dd88ae9bacf2ad9ae53 100644
--- a/subcontracting/locale/pt/fusiondirectory.po
+++ b/subcontracting/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/subcontracting/locale/pt_BR/fusiondirectory.po b/subcontracting/locale/pt_BR/fusiondirectory.po
index 6ee821ad9b21ef76adb480855d1ab76153743f25..6c76ac26865a1b6dd3d84904d42bbfe93171181a 100644
--- a/subcontracting/locale/pt_BR/fusiondirectory.po
+++ b/subcontracting/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/subcontracting/locale/ru/fusiondirectory.po b/subcontracting/locale/ru/fusiondirectory.po
index 4a499a25ad259b3ee999dd940227c658738cd846..29730eff9357082ab0d9cb7659602b584c389f26 100644
--- a/subcontracting/locale/ru/fusiondirectory.po
+++ b/subcontracting/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/subcontracting/locale/ru@petr1708/fusiondirectory.po b/subcontracting/locale/ru@petr1708/fusiondirectory.po
index 4be19ca27264d647831a63831423d0d4c155fa27..6c3bc7822d147a01ed49f6936bd0f923df2c9ee0 100644
--- a/subcontracting/locale/ru@petr1708/fusiondirectory.po
+++ b/subcontracting/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/sv/fusiondirectory.po b/subcontracting/locale/sv/fusiondirectory.po
index 4639a02fefb12c223d367228042b6d07e8c16809..e82224f7aa76c81f1f956a63ecdb72fc2cf63815 100644
--- a/subcontracting/locale/sv/fusiondirectory.po
+++ b/subcontracting/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/subcontracting/locale/ug/fusiondirectory.po b/subcontracting/locale/ug/fusiondirectory.po
index f77c5733b1505d2eee9c45babba515c4bf78cef2..3a2606fc1ab5174ca88c3b255efef0d04e5171fc 100644
--- a/subcontracting/locale/ug/fusiondirectory.po
+++ b/subcontracting/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/vi_VN/fusiondirectory.po b/subcontracting/locale/vi_VN/fusiondirectory.po
index 7a0c213c4d7718de77fd2c5cabd9a6f33dbded3f..f41ffc78c2a66e375838f16c9d2d3b7fb1b9811a 100644
--- a/subcontracting/locale/vi_VN/fusiondirectory.po
+++ b/subcontracting/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/subcontracting/locale/zh/fusiondirectory.po b/subcontracting/locale/zh/fusiondirectory.po
index 6c34a38873c82ede2bbb0a89d4a27cad5acb3596..684410978d664e8bb171b230a2de8b1226ffc965 100644
--- a/subcontracting/locale/zh/fusiondirectory.po
+++ b/subcontracting/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/sudo/locale/ar/fusiondirectory.po b/sudo/locale/ar/fusiondirectory.po
index 288ff570b7125bb8ea23535174d4c11986a416e0..7ac5ab6fe58d5c1864800a92a50cf44e48213f78 100644
--- a/sudo/locale/ar/fusiondirectory.po
+++ b/sudo/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/sudo/locale/ca/fusiondirectory.po b/sudo/locale/ca/fusiondirectory.po
index 322e1a645904b5c1466b208ea9ad4ae84b716d48..8df0abb5029856af68f21650502c0898b2661b5a 100644
--- a/sudo/locale/ca/fusiondirectory.po
+++ b/sudo/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/sudo/locale/cs_CZ/fusiondirectory.po b/sudo/locale/cs_CZ/fusiondirectory.po
index 0ca9b8bc833ef76a4930f22f2c6e48ab71574f46..e26efbe7d6a8fe2abe5515e49b67a6626d8be11a 100644
--- a/sudo/locale/cs_CZ/fusiondirectory.po
+++ b/sudo/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/sudo/locale/de/fusiondirectory.po b/sudo/locale/de/fusiondirectory.po
index 31536d25275cd6c1515b4f54d6de16de52152e8b..998b3e637db97bbef56a06f0006004048d861dd8 100644
--- a/sudo/locale/de/fusiondirectory.po
+++ b/sudo/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/sudo/locale/el_GR/fusiondirectory.po b/sudo/locale/el_GR/fusiondirectory.po
index e2b99689495cf3ae73060f95c145bbc3f14bd64c..59ce34ad6fdd13cdee808d7078afc90c34dd7e97 100644
--- a/sudo/locale/el_GR/fusiondirectory.po
+++ b/sudo/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/sudo/locale/en/fusiondirectory.po b/sudo/locale/en/fusiondirectory.po
index 50ff81ebda0e34b50790a0eb088a9b0282a5a5af..81e424c54ee09f27580af23a4007332691bff687 100644
--- a/sudo/locale/en/fusiondirectory.po
+++ b/sudo/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/sudo/locale/es/fusiondirectory.po b/sudo/locale/es/fusiondirectory.po
index 416fb67c33c469c649f2466e89303bd22917d449..6c05f2e6a469959c0d7becb4e87cafe37277e8e1 100644
--- a/sudo/locale/es/fusiondirectory.po
+++ b/sudo/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/sudo/locale/es_CO/fusiondirectory.po b/sudo/locale/es_CO/fusiondirectory.po
index 355bc96a7893a52d3468e4579f714b693e1b250d..0abcb4c3a7e9843e446d6836eca0d6cbc00d502e 100644
--- a/sudo/locale/es_CO/fusiondirectory.po
+++ b/sudo/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/sudo/locale/es_VE/fusiondirectory.po b/sudo/locale/es_VE/fusiondirectory.po
index d17c51e43feffda7c1a050f6d740d22a1b730617..00f0cdbaaa7053b0e57d1686a66b1cf3dbb41074 100644
--- a/sudo/locale/es_VE/fusiondirectory.po
+++ b/sudo/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/sudo/locale/fa_IR/fusiondirectory.po b/sudo/locale/fa_IR/fusiondirectory.po
index e9139bebc6b0f9b000b016d89def32043bc77486..fe7d500b7863e62a969ce21b8ab7aad39689dad0 100644
--- a/sudo/locale/fa_IR/fusiondirectory.po
+++ b/sudo/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/fi_FI/fusiondirectory.po b/sudo/locale/fi_FI/fusiondirectory.po
index bf93d9a9dff05f1bfed75f0b4648fad2a3b50ba9..871448aea4bcf1452f9c5aa93b9334f74917eddc 100644
--- a/sudo/locale/fi_FI/fusiondirectory.po
+++ b/sudo/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/sudo/locale/fr/fusiondirectory.po b/sudo/locale/fr/fusiondirectory.po
index 61c8db76b098905af04a43297c1bd6ec3d81e2c4..1fe1ccd57ca7f8261817122d8ad1f8a48bc2f2dc 100644
--- a/sudo/locale/fr/fusiondirectory.po
+++ b/sudo/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/sudo/locale/hu_HU/fusiondirectory.po b/sudo/locale/hu_HU/fusiondirectory.po
index 68ad8e097b7f7569d51329967440d726ec6757e2..a9b3a427cfa9a1318a5252842ce56073e63f7262 100644
--- a/sudo/locale/hu_HU/fusiondirectory.po
+++ b/sudo/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/sudo/locale/id/fusiondirectory.po b/sudo/locale/id/fusiondirectory.po
index c1c11f9833974188c3793aacbfcc04dd0702dd09..4a3aff3031abb843368d82427c07b88ec1eae2e4 100644
--- a/sudo/locale/id/fusiondirectory.po
+++ b/sudo/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/it_IT/fusiondirectory.po b/sudo/locale/it_IT/fusiondirectory.po
index 3ce2dd0c798c5697f0d1b01f53f9511bfefa636a..8170ce5021c263bbdf10b0c3156226863d9f9a1c 100644
--- a/sudo/locale/it_IT/fusiondirectory.po
+++ b/sudo/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/sudo/locale/lv/fusiondirectory.po b/sudo/locale/lv/fusiondirectory.po
index 491254c90597118a423288aaad8caeda323cc887..e4a6134686593ec28e50ecd4573ed8a5d0597f6c 100644
--- a/sudo/locale/lv/fusiondirectory.po
+++ b/sudo/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/sudo/locale/nb/fusiondirectory.po b/sudo/locale/nb/fusiondirectory.po
index 24c276fae595bdf75668aaf2fb479b76e23a2ef1..d377568900be14467181af5e69b63e944ab26af9 100644
--- a/sudo/locale/nb/fusiondirectory.po
+++ b/sudo/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/sudo/locale/nl/fusiondirectory.po b/sudo/locale/nl/fusiondirectory.po
index c1d859a83f1d97e3713e1ae18f586fca327db0a8..22cff3935a35a98b773387d468b1ca95ff147840 100644
--- a/sudo/locale/nl/fusiondirectory.po
+++ b/sudo/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/sudo/locale/pl/fusiondirectory.po b/sudo/locale/pl/fusiondirectory.po
index 2a4755c27058374d3307ae002db0a816fa40eba7..29c0cc6e9961c03f196a250563df0fe4cb269c7b 100644
--- a/sudo/locale/pl/fusiondirectory.po
+++ b/sudo/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
diff --git a/sudo/locale/pt/fusiondirectory.po b/sudo/locale/pt/fusiondirectory.po
index e4adb4629edde031cc860cb40638056a2f1a42cb..f1eff0f117c7fced279b52d790dd8f90390c2db8 100644
--- a/sudo/locale/pt/fusiondirectory.po
+++ b/sudo/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/sudo/locale/pt_BR/fusiondirectory.po b/sudo/locale/pt_BR/fusiondirectory.po
index aec26b770aa51ae8206c4a6e07f2dfbf30c70a8c..f0b13541ef95a6a45e34d52ffc4ddf916274ee46 100644
--- a/sudo/locale/pt_BR/fusiondirectory.po
+++ b/sudo/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/sudo/locale/ru/fusiondirectory.po b/sudo/locale/ru/fusiondirectory.po
index b06770dbb695b54c9b28ad245729a74db5d750c3..74b48764eeffde6ce61ddbfd88ddfd42f4201017 100644
--- a/sudo/locale/ru/fusiondirectory.po
+++ b/sudo/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/sudo/locale/ru@petr1708/fusiondirectory.po b/sudo/locale/ru@petr1708/fusiondirectory.po
index 82fe05941e035f74467b210f8467962abfeb7d7a..042c6028831dcd85c1b0a5128f369b29d1e0eefe 100644
--- a/sudo/locale/ru@petr1708/fusiondirectory.po
+++ b/sudo/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/sv/fusiondirectory.po b/sudo/locale/sv/fusiondirectory.po
index aa9fcb8838eb54a4d31d18c4dc5b81b3913f9af4..5829b6b20e079e0aed335dc0102a66664cc46001 100644
--- a/sudo/locale/sv/fusiondirectory.po
+++ b/sudo/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/sudo/locale/ug/fusiondirectory.po b/sudo/locale/ug/fusiondirectory.po
index 5f981e466ddec31450e8e4a5d38df0b2d8154805..8961447660a0537615cbd2ab8b5a075a77614903 100644
--- a/sudo/locale/ug/fusiondirectory.po
+++ b/sudo/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/vi_VN/fusiondirectory.po b/sudo/locale/vi_VN/fusiondirectory.po
index de0ccd9081c2e1e66a6565de752998f8bf4c1e9e..9dd2a05c73ff1e715dd100e58b4d5a3977a5f407 100644
--- a/sudo/locale/vi_VN/fusiondirectory.po
+++ b/sudo/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/sudo/locale/zh/fusiondirectory.po b/sudo/locale/zh/fusiondirectory.po
index 381ca2de4038ac20488b242690331546cd7ad320..0d9878705716a3878b8625fd78290bd030290780 100644
--- a/sudo/locale/zh/fusiondirectory.po
+++ b/sudo/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/supann/locale/ar/fusiondirectory.po b/supann/locale/ar/fusiondirectory.po
index b587380f17afcd8e76a8a4f64b60edf9096b24a7..47137d190a3aad9914a8a8d04b35a72b54ffaebe 100644
--- a/supann/locale/ar/fusiondirectory.po
+++ b/supann/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/supann/locale/ca/fusiondirectory.po b/supann/locale/ca/fusiondirectory.po
index 8076fc9b30f6a1aaeaa752a17e2d325c22d0ef9c..f3f981c5e8d9a5184243ae296285748288cdb391 100644
--- a/supann/locale/ca/fusiondirectory.po
+++ b/supann/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/supann/locale/cs_CZ/fusiondirectory.po b/supann/locale/cs_CZ/fusiondirectory.po
index 6fdaa35f1ed80a17a29c85bc49b04c83ad8a512c..71433c8b0c523a8e387327430999226e9ad4a527 100644
--- a/supann/locale/cs_CZ/fusiondirectory.po
+++ b/supann/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/supann/locale/de/fusiondirectory.po b/supann/locale/de/fusiondirectory.po
index d95e7bf1122277ef5bc56d2f56d1e8da98a0d40d..d10f27c2f2f6e0a3ca4812057d2984f4529f441b 100644
--- a/supann/locale/de/fusiondirectory.po
+++ b/supann/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/supann/locale/el_GR/fusiondirectory.po b/supann/locale/el_GR/fusiondirectory.po
index d8f2ff7e17f99403d3cfd02cc7d0482a0e505634..b2016bd835f5e2a22a40d55e2477f62a64e1ca00 100644
--- a/supann/locale/el_GR/fusiondirectory.po
+++ b/supann/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/supann/locale/en/fusiondirectory.po b/supann/locale/en/fusiondirectory.po
index 97202e3ad2867aa2c50af6e302ad7a402a22fe23..464b6bcdc39ece0f24dee89cd68a2ab9edeeb5cb 100644
--- a/supann/locale/en/fusiondirectory.po
+++ b/supann/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/supann/locale/es/fusiondirectory.po b/supann/locale/es/fusiondirectory.po
index a287d14f270c993ec65f73f1eed14be31c7703dc..f23dca3c4c7537c975452d6e35a26dcad9c1f5c5 100644
--- a/supann/locale/es/fusiondirectory.po
+++ b/supann/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/supann/locale/es_CO/fusiondirectory.po b/supann/locale/es_CO/fusiondirectory.po
index a15212ac0eb3eea7e0a60cc6a22d87b051d93a6a..443fa5ebce88b9ba85e7d6df2264fcde6f248251 100644
--- a/supann/locale/es_CO/fusiondirectory.po
+++ b/supann/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/supann/locale/es_VE/fusiondirectory.po b/supann/locale/es_VE/fusiondirectory.po
index 27a3f793c3e8a746c50a406c19e02239aad83a49..aa7abc20991c3f8d0c034a711174e123fda48d66 100644
--- a/supann/locale/es_VE/fusiondirectory.po
+++ b/supann/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/supann/locale/fa_IR/fusiondirectory.po b/supann/locale/fa_IR/fusiondirectory.po
index 3f6b6a168814a752c70ab055392fa94417b60f51..d75ab249612239f64117f4fa1667404777750250 100644
--- a/supann/locale/fa_IR/fusiondirectory.po
+++ b/supann/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/supann/locale/fi_FI/fusiondirectory.po b/supann/locale/fi_FI/fusiondirectory.po
index 90ec7d9d7c0827193a7235f86091e60e032d2035..546451f29f599ccfa7d78dd620a497ac5856eb0f 100644
--- a/supann/locale/fi_FI/fusiondirectory.po
+++ b/supann/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/supann/locale/fr/fusiondirectory.po b/supann/locale/fr/fusiondirectory.po
index 082bd0be01ef480028f71cd398b94a0a71a115d1..d24bc96c04c68501a3d99d520f5b71562dcdfb80 100644
--- a/supann/locale/fr/fusiondirectory.po
+++ b/supann/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/supann/locale/hu_HU/fusiondirectory.po b/supann/locale/hu_HU/fusiondirectory.po
index 32e9cf06ea37561c949a0b36bba6d1edbd277d1f..5961a2f743a1e695711dbac6baf64cc56ce31524 100644
--- a/supann/locale/hu_HU/fusiondirectory.po
+++ b/supann/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/supann/locale/id/fusiondirectory.po b/supann/locale/id/fusiondirectory.po
index 460b7b77b7cd51056c39f5a057f2da8dc532b845..859ed2a1d171122264f71f9ae7827a1979254e2d 100644
--- a/supann/locale/id/fusiondirectory.po
+++ b/supann/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/supann/locale/it_IT/fusiondirectory.po b/supann/locale/it_IT/fusiondirectory.po
index 7f651acbc713f22ff9aa18c1e54e3bd21fed1ee5..47254a9d999749b48e35f75a77d1c658906aca5a 100644
--- a/supann/locale/it_IT/fusiondirectory.po
+++ b/supann/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/supann/locale/lv/fusiondirectory.po b/supann/locale/lv/fusiondirectory.po
index 090662ca36520a8e5858aae602cc77286094a57e..62053df0c56293a186181e1049d00d759d73d7b9 100644
--- a/supann/locale/lv/fusiondirectory.po
+++ b/supann/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/supann/locale/nb/fusiondirectory.po b/supann/locale/nb/fusiondirectory.po
index ca99b6a35ccc10bc12367a53e245dd5cadadb482..0098afd7fce82a9b64f7bd81571f3f3d85870568 100644
--- a/supann/locale/nb/fusiondirectory.po
+++ b/supann/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/supann/locale/nl/fusiondirectory.po b/supann/locale/nl/fusiondirectory.po
index 26b7955b5b94e5337ef3744f8dc714b16ef99807..b631ae2c60301c2183006bf4c4812c2f7932946d 100644
--- a/supann/locale/nl/fusiondirectory.po
+++ b/supann/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/supann/locale/pl/fusiondirectory.po b/supann/locale/pl/fusiondirectory.po
index 3ba70bb2728a92ba5f03e9beee4babc37f66a380..3747c14b7ce9eeb12364d0e1171e2485d5bcac76 100644
--- a/supann/locale/pl/fusiondirectory.po
+++ b/supann/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
diff --git a/supann/locale/pt/fusiondirectory.po b/supann/locale/pt/fusiondirectory.po
index c520f928c003440e2e54cea2745050bf1241e38c..6fa1b59350aa03eda6931c0ddfba6d660154c849 100644
--- a/supann/locale/pt/fusiondirectory.po
+++ b/supann/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/supann/locale/pt_BR/fusiondirectory.po b/supann/locale/pt_BR/fusiondirectory.po
index 40447862e6e3e1020b15e77931b16f5bd44aedab..c316699ae6a10bf522abbfa92d6f10bf73ac1f65 100644
--- a/supann/locale/pt_BR/fusiondirectory.po
+++ b/supann/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/supann/locale/ru/fusiondirectory.po b/supann/locale/ru/fusiondirectory.po
index 3b2e550e09a5a60799427a36552e1e3d8d6c1bb7..085931adb0c3f5a24c8a5e380c10bfb4f82e58bf 100644
--- a/supann/locale/ru/fusiondirectory.po
+++ b/supann/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/supann/locale/ru@petr1708/fusiondirectory.po b/supann/locale/ru@petr1708/fusiondirectory.po
index 9c01b84d18d4ebf0bb1112d40f679a3d2a9f2318..7d0803fd6a4de753f849614ffa100cde1d567d98 100644
--- a/supann/locale/ru@petr1708/fusiondirectory.po
+++ b/supann/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/supann/locale/sv/fusiondirectory.po b/supann/locale/sv/fusiondirectory.po
index b98781d0871c3024e13c63778bd85047e3345fee..0fc4c8172d28e8865da88098decc8348760faf61 100644
--- a/supann/locale/sv/fusiondirectory.po
+++ b/supann/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/supann/locale/ug/fusiondirectory.po b/supann/locale/ug/fusiondirectory.po
index 7973afe045574865b719c012bf2482b5063efcbd..19d1c4640260248134118618a36d4fc687684ba8 100644
--- a/supann/locale/ug/fusiondirectory.po
+++ b/supann/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/supann/locale/vi_VN/fusiondirectory.po b/supann/locale/vi_VN/fusiondirectory.po
index 941a0231a0210934b490e8e1a234c1d7e8cb489d..f883c5d35893bd83abb7a78bf0cbb5c7b2b029b5 100644
--- a/supann/locale/vi_VN/fusiondirectory.po
+++ b/supann/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/supann/locale/zh/fusiondirectory.po b/supann/locale/zh/fusiondirectory.po
index a6e986b1ff58443ea1294ba098ca102599377dd1..17780b046caa8e3a174c17bd5603103780928b9d 100644
--- a/supann/locale/zh/fusiondirectory.po
+++ b/supann/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/sympa/admin/sympa/class_sympaAlias.inc b/sympa/admin/sympa/class_sympaAlias.inc
index 9984c0ef869c38c4af07ebb835fec3d6059301c1..d77244492ce3c52498d0ad2cd59150e3fb30193e 100644
--- a/sympa/admin/sympa/class_sympaAlias.inc
+++ b/sympa/admin/sympa/class_sympaAlias.inc
@@ -32,9 +32,8 @@ class sympaAlias extends simplePlugin
       'plObjectType'  => array('sympaAlias' => array(
         'name'        => _('Sympa list alias'),
         'filter'      => 'objectClass=sympaAlias',
-        'aclCategory' => 'alias',
         'icon'        => 'geticon.php?context=applications&icon=sympa&size=16',
-        'ou'          => get_ou('aliasRDN'),
+        'ou'          => get_ou('sympaRDN'),
       )),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
@@ -49,7 +48,7 @@ class sympaAlias extends simplePlugin
       'main' => array(
         'name'  => _('Sympa list alias'),
         'attrs' => array(
-          new BaseSelectorAttribute (get_ou('aliasRDN')),
+          new BaseSelectorAttribute (get_ou('sympaRDN')),
           new HostNameAttribute (_('Name'), _('Name to identify this alias'), 'cn', TRUE),
           new TextAreaAttribute (
             _('Description'), _('Description of this alias'),
diff --git a/sympa/admin/sympa/class_sympaManagement.inc b/sympa/admin/sympa/class_sympaManagement.inc
new file mode 100644
index 0000000000000000000000000000000000000000..0488191dee4901653dfb85ad0703876490f31c31
--- /dev/null
+++ b/sympa/admin/sympa/class_sympaManagement.inc
@@ -0,0 +1,44 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2010 Antoine Gallavardin
+  Copyright (C) 2012-2017 FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class sympaManagement extends simpleManagement
+{
+  // Tab definition
+  protected $objectTypes  = array('sympaAlias');
+
+  protected $autoFilterAttributes = array('dn', 'cn', 'description');
+
+  /* Return plugin information for acl handling  */
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'   => _('Sympa'),
+      'plDescription' => _('Sympa management'),
+      'plIcon'        => 'geticon.php?context=applications&icon=sympa&size=48',
+      'plSection'     => 'accounts',
+      'plPriority'    => 26,
+      'plManages'     => array('sympaAlias'),
+
+      'plProvidedAcls' => array()
+    );
+  }
+}
+?>
diff --git a/sympa/admin/sympa/main.inc b/sympa/admin/sympa/main.inc
new file mode 100644
index 0000000000000000000000000000000000000000..6e7fd5bd4941b0b6594087a720296243b0de8858
--- /dev/null
+++ b/sympa/admin/sympa/main.inc
@@ -0,0 +1,22 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org)
+  Copyright (C) 2017 FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+simpleManagement::mainInc('sympaManagement');
+?>
diff --git a/sympa/config/sympa/class_sympaConfig.inc b/sympa/config/sympa/class_sympaConfig.inc
new file mode 100644
index 0000000000000000000000000000000000000000..6ee11c0741a78468eb79af13891f0dfb3fd7eb86
--- /dev/null
+++ b/sympa/config/sympa/class_sympaConfig.inc
@@ -0,0 +1,54 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2012-2017 FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class sympaConfig extends simplePlugin
+{
+  var $objectclasses  = array('fdSympaPluginConf');
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('Sympa configuration'),
+      'plDescription'   => _('FusionDirectory sympa plugin configuration'),
+      'plSelfModify'    => FALSE,
+      'plCategory'      => array('configuration'),
+      'plObjectType'    => array('smallConfig'),
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('Sympa'),
+        'attrs' => array(
+          new StringAttribute (
+            _('Sympa RDN'), _('Branch in which Sympa objects will be stored'),
+            'fdSympaRDN', TRUE,
+            'ou=sympa'
+          ),
+        )
+      ),
+    );
+  }
+}
+?>
diff --git a/sympa/contrib/openldap/sympa-fd-conf.schema b/sympa/contrib/openldap/sympa-fd-conf.schema
new file mode 100644
index 0000000000000000000000000000000000000000..a338cadfda4284baeb7638fe13e738b49a717610
--- /dev/null
+++ b/sympa/contrib/openldap/sympa-fd-conf.schema
@@ -0,0 +1,16 @@
+##
+## sympa-fd.schema - Needed by Fusion Directory for managing sympa plugin configuration backend
+##
+
+attributetype ( 1.3.6.1.4.1.38414.64.1.1 NAME 'fdSympaRDN'
+  DESC 'FusionDirectory - Sympa RDN'
+  EQUALITY caseExactIA5Match
+  SUBSTR caseExactIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
+objectclass ( 1.3.6.1.4.1.38414.64.2.1 NAME 'fdSympaPluginConf'
+  DESC 'FusionDirectory sympa plugin configuration'
+  SUP top AUXILIARY
+  MUST ( cn )
+  MAY ( fdSympaRDN ) )
diff --git a/sympa/contrib/openldap/sympa-fd.schema b/sympa/contrib/openldap/sympa-fd.schema
index 8f0fe3c20f8af25d292eae984353b93c224a7137..8f7d26ec50a87b49e6b3ae032c7462ce11d7d9cc 100644
--- a/sympa/contrib/openldap/sympa-fd.schema
+++ b/sympa/contrib/openldap/sympa-fd.schema
@@ -26,12 +26,12 @@ attributetype ( 1.3.6.1.4.1.38414.12.1.3 NAME 'sympaServerPassword'
 
 # Object Class
 objectclass (1.3.6.1.4.1.38414.12.2.1 NAME 'sympaAlias'
-        DESC 'FusionDirectory - Mail alias class'
+        DESC 'FusionDirectory - Sympa alias class'
         MUST ( cn $ mail $ sympaServerURL )
         MAY  ( description ) )
 
 objectclass (1.3.6.1.4.1.38414.12.2.2 NAME 'sympaServer'
         SUP top AUXILIARY
-        DESC 'FusionDirectory - Mail alias class'
+        DESC 'FusionDirectory - Sympa server'
         MUST ( sympaServerURL )
         MAY ( sympaServerUser $ sympaServerPassword ) )
diff --git a/sympa/locale/ar/fusiondirectory.po b/sympa/locale/ar/fusiondirectory.po
index 102591962bc744d5456e3519917f6e92d2da5ca1..a506e22a88c3a2c1e28fdbaed2c814ed04e8af8c 100644
--- a/sympa/locale/ar/fusiondirectory.po
+++ b/sympa/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "الوصف"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/ca/fusiondirectory.po b/sympa/locale/ca/fusiondirectory.po
index b9639400373e341fa23ec3b157abae402a9db852..2279766c729a1cd82f82cdaa2e4f55c3a7b0187f 100644
--- a/sympa/locale/ca/fusiondirectory.po
+++ b/sympa/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/cs_CZ/fusiondirectory.po b/sympa/locale/cs_CZ/fusiondirectory.po
index 06db785fde908f66663cd0a190845c7a3c68b96f..ed4d1d8453c39093a0b4820de190db103fcd4af2 100644
--- a/sympa/locale/cs_CZ/fusiondirectory.po
+++ b/sympa/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr "Alternativní název Sympa seznamu"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "název"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Název pro identifikaci tohoto alternativního názvu"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "popis"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Popis tohoto alternativního názvu"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "e-mailová adresa"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr "Sympa server"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr "Sympa server pro tento alternativní název"
 
diff --git a/sympa/locale/de/fusiondirectory.po b/sympa/locale/de/fusiondirectory.po
index 52e43b5d8d6deebef2c22372a6c1222d11f97e65..3ebdf32f4fd303cd4cc389c54b8548cdd6f06a05 100644
--- a/sympa/locale/de/fusiondirectory.po
+++ b/sympa/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr "Sympalisten-Alias"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Name"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Name um dieses Alias zu identifizieren"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Beschreibung dieses Alias"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Email-Adresse"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr "Sympa-Server"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr "Samba-Server für dieses Alias"
 
diff --git a/sympa/locale/el_GR/fusiondirectory.po b/sympa/locale/el_GR/fusiondirectory.po
index 9bcb660d1b4e81fac0d1189dd61b1259af43145b..19cb4696817f36dc5a30b2db767adbb98ddb6dee 100644
--- a/sympa/locale/el_GR/fusiondirectory.po
+++ b/sympa/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr "Ψευδώνυμο λίστας Sympa"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Ένα όνομα με το οποίο θα αναγνωρίζεται αυτό το ψευδώνυμο"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Περιγραφή του ψευδώνυμου"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Διευθύνση ηλεκτρονικής αλληλογγραφίας"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr "Διακομιστής Sympa"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr "Διακομιστής Sympa για αυτό το ψευδώνυμο"
 
diff --git a/sympa/locale/en/fusiondirectory.po b/sympa/locale/en/fusiondirectory.po
index 7381373a901cc21b4ac561913fb4d94bc0e887f5..f03fb5d57c6bc57d34ea6faefcdf1d8793d00bd5 100644
--- a/sympa/locale/en/fusiondirectory.po
+++ b/sympa/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,37 +17,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/es/fusiondirectory.po b/sympa/locale/es/fusiondirectory.po
index 4da180cc57ac26014e6223b45b7a288e0d6ce9e8..20daded5c7ca93d745c9f7efbe392d5073aa23cc 100644
--- a/sympa/locale/es/fusiondirectory.po
+++ b/sympa/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/es_CO/fusiondirectory.po b/sympa/locale/es_CO/fusiondirectory.po
index 1ff4eda83366f7a5f82c1632926d96f4709fbb08..952c11ed5b4c7e1da75279895ce358457f9abdee 100644
--- a/sympa/locale/es_CO/fusiondirectory.po
+++ b/sympa/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/es_VE/fusiondirectory.po b/sympa/locale/es_VE/fusiondirectory.po
index 85ca433151f2cdb830c12750bb6b9a4228f5a620..e83c054f7122c4934ff2e5041af9d3813aeaa618 100644
--- a/sympa/locale/es_VE/fusiondirectory.po
+++ b/sympa/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/fa_IR/fusiondirectory.po b/sympa/locale/fa_IR/fusiondirectory.po
index 0df4f9a80ce9818185a874dbd2e3f87dc1c13b14..4129a1f2366ec9bff62284fef18d5fefe651290e 100644
--- a/sympa/locale/fa_IR/fusiondirectory.po
+++ b/sympa/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,62 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/fi_FI/fusiondirectory.po b/sympa/locale/fi_FI/fusiondirectory.po
index 6902d68b02534e01eea848f012facc34768a3262..2b88aee8637ec93cb85c83841c7bf0fe182ca157 100644
--- a/sympa/locale/fi_FI/fusiondirectory.po
+++ b/sympa/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Kuvaus"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/fr/fusiondirectory.po b/sympa/locale/fr/fusiondirectory.po
index 6f330779fbc674b5cfd18a717b0a4a83524a3524..bc2ebbcdbb65b825366daa5a80e4757b2705dd66 100644
--- a/sympa/locale/fr/fusiondirectory.po
+++ b/sympa/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr "Configuration de Sympa"
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr "Configuration du plugin Sympa"
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr "Sympa"
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr "Sympa RDN"
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr "Branche où seront stockés les objets Sympa"
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr "Gestion de Sympa"
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
-msgstr "Liste des alias sympa"
+msgstr "Liste des alias de listes sympa"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Nom de l'alias"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Description"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Description de l'alias"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Adresse de messagerie"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr "Serveur sympa"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr "Serveur Sympa pour cet alias"
 
diff --git a/sympa/locale/hu_HU/fusiondirectory.po b/sympa/locale/hu_HU/fusiondirectory.po
index e036172fc28ab4eaa14f9386467ab91dea919646..615d4abd7bedee19381e188389c05bdfcbef5dec 100644
--- a/sympa/locale/hu_HU/fusiondirectory.po
+++ b/sympa/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Név"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Leírás"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/id/fusiondirectory.po b/sympa/locale/id/fusiondirectory.po
index 8c5ba0458e3bb8e34d1202dc69852338d2b0be2e..0cd0b7aa39af78c36e7039e4677fc70231e23e77 100644
--- a/sympa/locale/id/fusiondirectory.po
+++ b/sympa/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,62 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/it_IT/fusiondirectory.po b/sympa/locale/it_IT/fusiondirectory.po
index b5890e869039f52149a9aa2027e56440843ad0b1..883e5913013222a6d375590df8646d76edc857aa 100644
--- a/sympa/locale/it_IT/fusiondirectory.po
+++ b/sympa/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr "Configurazione di Sympa"
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr "Configurazione del plugin sympa di FusionDirectory"
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr "Sympa"
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr "Sympa RDN"
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr "Ramo in cui gli oggetti Sympa saranno immagazzinati"
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr "Gestione di Sympa"
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr "Elenco alias sympa"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Nome per identificare questo alias"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Descrizione di questo alias"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Indirizzo di posta elettronica"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr "Server Sympa"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr "Server Sympa per questo alias"
 
diff --git a/sympa/locale/lv/fusiondirectory.po b/sympa/locale/lv/fusiondirectory.po
index 67f6694f1f4f9f20e44575f7ca7913493a709dad..ab373f0a0fecce880761151aee5bf630492cbc13 100644
--- a/sympa/locale/lv/fusiondirectory.po
+++ b/sympa/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Apraksts"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "E-pasta adrese"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/nb/fusiondirectory.po b/sympa/locale/nb/fusiondirectory.po
index de1195e26aaa11b781d06dd0d90b7e5d4cb41911..a6d35fec96693616304b4e33d42e2ead83a56b1a 100644
--- a/sympa/locale/nb/fusiondirectory.po
+++ b/sympa/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Navn"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/nl/fusiondirectory.po b/sympa/locale/nl/fusiondirectory.po
index 4270f27ad158ff8c7f84a70b97f4d79b663b8399..cf2a4c91d79a6a567557e3e63cffe6dab96d4847 100644
--- a/sympa/locale/nl/fusiondirectory.po
+++ b/sympa/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr "Sympa alias lijst"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Naam"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Naam om deze alias te identificeren"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Beschrijving van deze alias"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "E-mail adres"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr "Sympa server"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr "Sympa server voor deze alias"
 
diff --git a/sympa/locale/pl/fusiondirectory.po b/sympa/locale/pl/fusiondirectory.po
index 4882ea9e4d206a70527ba334078a1f35e26b9b64..fe97a61581924ddc47b333c58584db5adf81f85f 100644
--- a/sympa/locale/pl/fusiondirectory.po
+++ b/sympa/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,39 +16,64 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
 
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Opis"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Adres email"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/pt/fusiondirectory.po b/sympa/locale/pt/fusiondirectory.po
index 2b163ae4ba0478078a03d9c7851fa41ac03ae216..8af4b6d41d0902a2277a4ad6bfe22b0ffeccb50f 100644
--- a/sympa/locale/pt/fusiondirectory.po
+++ b/sympa/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Descrição"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/pt_BR/fusiondirectory.po b/sympa/locale/pt_BR/fusiondirectory.po
index 962bf4af2c2f577c2cf4d23bedf0da5392c5e3bf..7a6c14d2c298fe1a1fd17e84f2488a426c7a1d51 100644
--- a/sympa/locale/pt_BR/fusiondirectory.po
+++ b/sympa/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr "Lista de apelidos Sympa"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Nome para identificar este alias"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Descrição"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Descrição deste alias"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr "Servidor sympa"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/ru/fusiondirectory.po b/sympa/locale/ru/fusiondirectory.po
index 80c98abfb62d8a85968ad092f4d0258247a09664..991442a8e206f704d4d3e71fedc681f57a8dd7ff 100644
--- a/sympa/locale/ru/fusiondirectory.po
+++ b/sympa/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Имя определяющее этот псеводоним"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Описание"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Описание псеводонима"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Адрес электронной почты"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/ru@petr1708/fusiondirectory.po b/sympa/locale/ru@petr1708/fusiondirectory.po
index 55878be7508cfaa3a6df7e192b94889b8f513d0d..59238feff6eba2a128fa3157099bbf82bf810791 100644
--- a/sympa/locale/ru@petr1708/fusiondirectory.po
+++ b/sympa/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,62 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/sv/fusiondirectory.po b/sympa/locale/sv/fusiondirectory.po
index cfce03134e8ab816e622a609c62cc7ef57110f0a..32312857a7d5149b85dde3506a7ba464dcc87f60 100644
--- a/sympa/locale/sv/fusiondirectory.po
+++ b/sympa/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr "Sympa-listalias"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Namn"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr "Namn för att att identifiera detta alias"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr "Beskrivning av alias"
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "Epostadress"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/ug/fusiondirectory.po b/sympa/locale/ug/fusiondirectory.po
index b13a7106a0b432896a4684904ccb5a622286179f..4dadbacbecd0fd60e92a516f4490fef854d75beb 100644
--- a/sympa/locale/ug/fusiondirectory.po
+++ b/sympa/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,62 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/vi_VN/fusiondirectory.po b/sympa/locale/vi_VN/fusiondirectory.po
index 3a1ac3582eba4abfe00fe73ccc2aabd47411091a..958f7237ed2bfe0a6960b3a0dbb23b3861c25ab8 100644
--- a/sympa/locale/vi_VN/fusiondirectory.po
+++ b/sympa/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "Tên"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "Mô tả"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/sympa/locale/zh/fusiondirectory.po b/sympa/locale/zh/fusiondirectory.po
index 6d8a9671a9067772bbb41cb43b0b14d505c4692e..3ae96b181022a1812e1650757125c1798d701264 100644
--- a/sympa/locale/zh/fusiondirectory.po
+++ b/sympa/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -18,37 +18,62 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:42
+#: admin/sympa/class_sympaManagement.inc:33
+msgid "Sympa"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
-#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
 msgid "Sympa list alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name"
 msgstr "名称"
 
-#: admin/sympa/class_sympaAlias.inc:53
+#: admin/sympa/class_sympaAlias.inc:52
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description"
 msgstr "描述"
 
-#: admin/sympa/class_sympaAlias.inc:55
+#: admin/sympa/class_sympaAlias.inc:54
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:60
+#: admin/sympa/class_sympaAlias.inc:59
 msgid "Email address"
 msgstr "邮件地址"
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
 msgid "Sympa server"
 msgstr ""
 
-#: admin/sympa/class_sympaAlias.inc:65
+#: admin/sympa/class_sympaAlias.inc:64
 msgid "Sympa server for this alias"
 msgstr ""
 
diff --git a/systems/addons/dashboard/class_dashBoardNetwork.inc b/systems/addons/dashboard/class_dashBoardNetwork.inc
index 6cb5059a734e5c592eb1bb33f74a7cfe55b418b0..ac606d9fe52cc272931c0de90a6484be6466e9c9 100644
--- a/systems/addons/dashboard/class_dashBoardNetwork.inc
+++ b/systems/addons/dashboard/class_dashBoardNetwork.inc
@@ -106,8 +106,7 @@ class dashboardNetwork extends simplePlugin
     $zones    = objects::ls('dnsZone', array('zoneName' => 1, 'sOARecord' => 1));
     foreach ($zones as $zonedn => $zone) {
       list ($fqdn)  = explode(' ', $zone['sOARecord']);
-      list ($cn)    = explode('.', $fqdn);
-      $search = objects::ls('server', NULL, NULL, '(&(cn='.$cn.')(fdDNSZoneDn='.$zonedn.'))');
+      $search = dnsManagement::findServerByFQDN($fqdn, $zonedn);
       foreach ($search as $dn => $name) {
         if (!isset($servers[$dn])) {
           $servers[$dn] = array(
diff --git a/systems/admin/systems/class_systemManagement.inc b/systems/admin/systems/class_systemManagement.inc
index 6db16ef46ee2ad3e20a8a907563f752403e45506..419fa1abad3de2a4eb1fd91f88003f2fbdfef893 100644
--- a/systems/admin/systems/class_systemManagement.inc
+++ b/systems/admin/systems/class_systemManagement.inc
@@ -73,7 +73,7 @@ class systemManagement extends simpleManagement
     $this->headpage->registerElementFilter('listServices',  'systemManagement::listServices');
 
     // Register Daemon Events
-    if (class_available('argonautAction') && class_available('supportDaemon')) {
+    if ($this->siActive) {
       $this->headpage->xmlData['actionmenu']['action'][2]['action'] = array();
       $this->headpage->xmlData['actionmenu']['action'][3]['action'] = array();
       $events = argonautEventTypes::get_event_types();
@@ -113,6 +113,10 @@ class systemManagement extends simpleManagement
    */
   function handleEvent($action, array $target)
   {
+    if (!$this->siActive) {
+      return;
+    }
+
     // Detect whether this event is scheduled or triggered.
     $triggered = TRUE;
     if (preg_match('/^S_/', $action)) {
@@ -124,56 +128,57 @@ class systemManagement extends simpleManagement
     $event = preg_replace('/^[TS]_/', '', $action);
 
     // Now send FAI/Argonaut events here.
-    if ($this->siActive) {
-      $mac = array();
-
-      // Collect target mac addresses
-      $events   = argonautEventTypes::get_event_types();
-      $o_queue  = new supportDaemon();
-      foreach ($target as $dn) {
-        $obj = $headpage->getEntry($dn);
-        if (isset($obj['macAddress'][0])) {
-          $mac[] = $obj['macAddress'][0];
-        } else {
-          msg_dialog::display(_('Action canceled'), sprintf(_('System %s has no mac address defined, cannot trigger action'), $dn), ERROR_DIALOG);
-        }
-      }
+    $mac = array();
 
-      if ((count($mac) == 0) && $triggered) {
-        return;
+    // Collect target mac addresses
+    foreach ($target as $dn) {
+      $obj = $headpage->getEntry($dn);
+      if (isset($obj['macAddress'][0])) {
+        $mac[] = $obj['macAddress'][0];
+      } else {
+        msg_dialog::display(_('Action canceled'), sprintf(_('System %s has no mac address defined, cannot trigger action'), $dn), ERROR_DIALOG);
       }
+    }
 
-      /* Skip installation or update trigerred events,
-       *  if this entry is currently processing.
-       */
-      if ($triggered && in_array($event, array('reinstall','update'))) {
-        foreach ($mac as $key => $mac_address) {
-          if ($o_queue->is_currently_installing($mac_address)) {
-            msg_dialog::display(_('Action canceled'), sprintf(_('System %s is currently installing'), $dn), ERROR_DIALOG);
-            unset($mac[$key]);
-            logging::log('security', 'systems/'.get_class($this), '', array(), 'Skip adding "argonautAction::'.$event.'" for mac "'.$mac_address.'", there is already a job in progress.');
-          }
+    if ((count($mac) == 0) && $triggered) {
+      return;
+    }
+
+    $o_queue  = new supportDaemon();
+
+    /* Skip installation or update trigerred events,
+     *  if this entry is currently processing.
+     */
+    if ($triggered && in_array($event, array('reinstall','update'))) {
+      foreach ($mac as $key => $mac_address) {
+        if ($o_queue->is_currently_installing($mac_address)) {
+          msg_dialog::display(_('Action canceled'), sprintf(_('System %s is currently installing'), $dn), ERROR_DIALOG);
+          unset($mac[$key]);
+          logging::log('security', 'systems/'.get_class($this), '', array(), 'Skip adding "argonautAction::'.$event.'" for mac "'.$mac_address.'", there is already a job in progress.');
         }
       }
+    }
 
-      // Prepare event to be added
-      if (isset($events[$event]) && $this->siActive) {
-        $this->dialogObject = new argonautAction($event);
-        $this->dialogObject->targets = $mac;
-
-        if ($triggered) {
-          $this->dialogObject->scheduled = FALSE;
-          $res = $o_queue->append($this->dialogObject);
-          if ($o_queue->is_error()) {
-            msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
-            $this->closeDialogs();
-          } else {
-            msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
-            $this->closeDialogs();
-          }
+    if ((count($mac) == 0) && $triggered) {
+      return;
+    }
+
+    // Prepare event to be added
+    $events   = argonautEventTypes::get_event_types();
+    if (isset($events[$event])) {
+      $this->dialogObject = new argonautAction($event, $mac);
+
+      if ($triggered) {
+        $this->dialogObject->scheduled = FALSE;
+        $res = $o_queue->append($this->dialogObject);
+        if ($o_queue->is_error()) {
+          msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
         } else {
-          $this->dialogObject->scheduled = TRUE;
+          msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
         }
+        $this->closeDialogs();
+      } else {
+        $this->dialogObject->scheduled = TRUE;
       }
     }
   }
@@ -183,6 +188,7 @@ class systemManagement extends simpleManagement
    */
   function saveEventDialog()
   {
+    $this->dialogObject->save_object();
     $msgs = $this->dialogObject->check();
     if (count($msgs)) {
       msg_dialog::displayChecks($msgs);
@@ -193,12 +199,11 @@ class systemManagement extends simpleManagement
       $o_queue->append($this->dialogObject);
       if ($o_queue->is_error()) {
         msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
-        $this->closeDialogs();
-      } else {
-        $this->closeDialogs();
       }
+      $this->closeDialogs();
     }
   }
+
   /*! \brief  Detects actions/events send by the ui
    *           and the corresponding targets.
    */
diff --git a/systems/admin/systems/class_workstationGeneric.inc b/systems/admin/systems/class_workstationGeneric.inc
index f84b53a3a3d5133c53061ca234a3a3b9b4d27ca6..0f183c2b84578b570c57e08220cb9fe25dd6b4e8 100644
--- a/systems/admin/systems/class_workstationGeneric.inc
+++ b/systems/admin/systems/class_workstationGeneric.inc
@@ -110,8 +110,8 @@ class workstationGeneric extends simplePlugin
     parent::__construct($dn, $object, $parent, $mainTab);
 
     $this->attributesAccess['cn']->setUnique(TRUE);
-    $this->attributesAccess['ipHostNumber']->setUnique('whole');
-    $this->attributesAccess['macAddress']->setUnique('whole');
+    $this->attributesAccess['ipHostNumber']->setUnique('whole', '(objectClass=ipHost)');
+    $this->attributesAccess['macAddress']->setUnique('whole', '(objectClass=ieee802Device)');
   }
 
   function remove_from_parent()
diff --git a/systems/locale/ar/fusiondirectory.po b/systems/locale/ar/fusiondirectory.po
index f51e005cd8f02bd427221d5d4b72dd6b0ea4e58e..213c978596fb680092dfa77df8b4748f84d6165c 100644
--- a/systems/locale/ar/fusiondirectory.po
+++ b/systems/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/systems/locale/ca/fusiondirectory.po b/systems/locale/ca/fusiondirectory.po
index b52e73b39455dce14ee6ca52d20620d916eee71f..1fc4928ca3aae84b25437b84d6ccf48c5390116a 100644
--- a/systems/locale/ca/fusiondirectory.po
+++ b/systems/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/systems/locale/cs_CZ/fusiondirectory.po b/systems/locale/cs_CZ/fusiondirectory.po
index 1ba12b1e3f3106e59116c8e54b8990ec8db17778..57599e41b6e96bba51b98d2e5cfc75f73ae9ebf4 100644
--- a/systems/locale/cs_CZ/fusiondirectory.po
+++ b/systems/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/systems/locale/de/fusiondirectory.po b/systems/locale/de/fusiondirectory.po
index 184d5ea21308a16111fdda561d525b34b670f7b9..63374680e8d23368a1527a43db7ffc691b2fbbb3 100644
--- a/systems/locale/de/fusiondirectory.po
+++ b/systems/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/systems/locale/el_GR/fusiondirectory.po b/systems/locale/el_GR/fusiondirectory.po
index 6be463908918e609c568358f6ecb81d1a6190788..09d67a3730e72dbf5847dfb4d84294a3f7036a2a 100644
--- a/systems/locale/el_GR/fusiondirectory.po
+++ b/systems/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/systems/locale/en/fusiondirectory.po b/systems/locale/en/fusiondirectory.po
index 8285091f1bc7b09cfcfbe05d6014ea38fa36fcca..ab13a3289ee3875c3fdf127c536e49561d18fe51 100644
--- a/systems/locale/en/fusiondirectory.po
+++ b/systems/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -837,36 +837,36 @@ msgstr ""
 msgid "Systems Management"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:138
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:139
+#: admin/systems/class_systemManagement.inc:155
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:139
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:155
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:168
-#: admin/systems/class_systemManagement.inc:195
+#: admin/systems/class_systemManagement.inc:175
+#: admin/systems/class_systemManagement.inc:201
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:171
+#: admin/systems/class_systemManagement.inc:177
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:171
+#: admin/systems/class_systemManagement.inc:177
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:263
+#: admin/systems/class_systemManagement.inc:268
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
diff --git a/systems/locale/es/fusiondirectory.po b/systems/locale/es/fusiondirectory.po
index 39ad09716fb76a91a5d65678d08cf6140cabe2da..7f6c9f293dd7ecd74bb131d28c73623aa14d8a86 100644
--- a/systems/locale/es/fusiondirectory.po
+++ b/systems/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/systems/locale/es_CO/fusiondirectory.po b/systems/locale/es_CO/fusiondirectory.po
index 4843ec9aa94ec2e310e21195844e1ec1fe8e60e8..50df1c94d67b8d4e17a593d69d8c7a2d387cdfde 100644
--- a/systems/locale/es_CO/fusiondirectory.po
+++ b/systems/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/systems/locale/es_VE/fusiondirectory.po b/systems/locale/es_VE/fusiondirectory.po
index e20e8efabf52423c11041b32d1cf429798efb154..29151002e9b3bf67f47e61875291099a6c84636a 100644
--- a/systems/locale/es_VE/fusiondirectory.po
+++ b/systems/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/systems/locale/fa_IR/fusiondirectory.po b/systems/locale/fa_IR/fusiondirectory.po
index 5863750a47dff55084533c974a02dc635cc05db0..e532f947efc20dfca1317ad5aaa971fbdf42d4fc 100644
--- a/systems/locale/fa_IR/fusiondirectory.po
+++ b/systems/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/systems/locale/fi_FI/fusiondirectory.po b/systems/locale/fi_FI/fusiondirectory.po
index e021a71e5e9ba195dbc6d5639bc42c6fb4851ebb..0bc7a8e2a6130c3dfebfa17d0472ff4b5fd08234 100644
--- a/systems/locale/fi_FI/fusiondirectory.po
+++ b/systems/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/systems/locale/fr/fusiondirectory.po b/systems/locale/fr/fusiondirectory.po
index 2435042664ef3d0a9376c5d067b72be8950cd9d9..91fd9b75fef668ac969360da3d4b4b7a6d14b8a0 100644
--- a/systems/locale/fr/fusiondirectory.po
+++ b/systems/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Côme Chilliet <come@chilliet.eu>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,7 +171,7 @@ msgstr "Encodage"
 
 #: config/systems/class_systemsPluginConfig.inc:93
 msgid "The encoding code name"
-msgstr "Nom de l'encodage"
+msgstr "Code de l'encodage"
 
 #: config/systems/class_systemsPluginConfig.inc:98
 msgid "Label"
@@ -248,7 +248,7 @@ msgstr "Arrêter"
 
 #: admin/systems/serverService-list.xml:113
 msgid "Restart"
-msgstr "Réessayer"
+msgstr "Redémarrer"
 
 #: admin/systems/serverService-list.xml:121
 msgid "Edit service"
@@ -525,7 +525,7 @@ msgstr "Station de travail"
 
 #: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
-msgstr "Information de la station de travail"
+msgstr "Informations de la station de travail"
 
 #: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
@@ -819,7 +819,7 @@ msgstr "Supprimer le système"
 
 #: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
-msgstr "Information sur le téléphone"
+msgstr "Informations du téléphone"
 
 #: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
@@ -827,19 +827,19 @@ msgstr "Matériel téléphonique"
 
 #: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
-msgstr "Nom du téléphone"
+msgstr "Le nom du téléphone"
 
 #: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
-msgstr "Courte description du téléphone"
+msgstr "Une courte description du téléphone"
 
 #: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
-msgstr "Numéro de série du téléphone"
+msgstr "Le numéro de série du téléphone"
 
 #: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
-msgstr "Numéro de téléphone"
+msgstr "Le numéro du téléphone"
 
 #: admin/systems/class_systemManagement.inc:44
 msgid "Systems Management"
@@ -854,12 +854,13 @@ msgstr "Action annulée"
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
-"Système %s n'a pas d'adresse mac définie, ne peut pas déclencher l'action"
+"Le système %s n'a pas d'adresse mac définie, impossible de déclencher "
+"l'action"
 
 #: admin/systems/class_systemManagement.inc:155
 #, php-format
 msgid "System %s is currently installing"
-msgstr "Système %s est actuellement en cours d'installation"
+msgstr "Le système %s est actuellement en cours d'installation"
 
 #: admin/systems/class_systemManagement.inc:175
 #: admin/systems/class_systemManagement.inc:201
@@ -873,7 +874,7 @@ msgstr "Action déclenchée"
 #: admin/systems/class_systemManagement.inc:177
 #, php-format
 msgid "Action called without error (result was \"%s\")"
-msgstr "Action appelée sans erreur (résultat \"%s\")"
+msgstr "Action appelée sans erreur (résultat : «%s»)"
 
 #: admin/systems/class_systemManagement.inc:268
 #, php-format
@@ -888,7 +889,7 @@ msgstr "Imprimante"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
-msgstr "Information de l’imprimante"
+msgstr "Informations de l’imprimante"
 
 #: admin/systems/class_printGeneric.inc:62
 msgid "The name of the printer"
@@ -916,7 +917,7 @@ msgstr "URL de l'imprimante"
 
 #: admin/systems/class_printGeneric.inc:79
 msgid "The URL of the printer"
-msgstr "L'url de l'imprimante"
+msgstr "L'URL de l'imprimante"
 
 #: admin/systems/class_printGeneric.inc:85
 #: admin/systems/class_printGeneric.inc:88
@@ -934,7 +935,7 @@ msgstr "Répertoires Windows"
 
 #: admin/systems/class_printGeneric.inc:123
 msgid "Inf file"
-msgstr "Le nom du fichier inf"
+msgstr "Fichier inf"
 
 #: admin/systems/class_printGeneric.inc:123
 msgid "Path to windows inf file for this printer"
@@ -942,17 +943,16 @@ msgstr "Le chemin vers le fichier inf de cette imprimante"
 
 #: admin/systems/class_printGeneric.inc:127
 msgid "Driver directory"
-msgstr "Répertoire du pilote d'imprimante"
+msgstr "Répertoire des pilotes"
 
 #: admin/systems/class_printGeneric.inc:127
 msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
-"Le chemin vers le répertoire qui contient les drivers inf pour cette "
-"imprimante"
+"Le chemin vers le répertoire qui contient les pilotes pour cette imprimante"
 
 #: admin/systems/class_printGeneric.inc:131
 msgid "Driver name"
-msgstr "Nom du driver d'imprimante"
+msgstr "Nom du pilote"
 
 #: admin/systems/class_printGeneric.inc:131
 msgid "Windows name of the printer driver"
@@ -970,7 +970,7 @@ msgstr "Terminal"
 
 #: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
-msgstr "Information du terminal"
+msgstr "Informations du terminal"
 
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
diff --git a/systems/locale/hu_HU/fusiondirectory.po b/systems/locale/hu_HU/fusiondirectory.po
index 0c06632bc9345d6c2e1c5298544140963584f4f1..3d7e1e3ca2f1a651a0b81140279e58c3a230961b 100644
--- a/systems/locale/hu_HU/fusiondirectory.po
+++ b/systems/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/systems/locale/id/fusiondirectory.po b/systems/locale/id/fusiondirectory.po
index 208f14ec67ef3cb9bfc1493732e10c4740d78e29..70242ecf005c20d05aa538b6d25b9dd24494e347 100644
--- a/systems/locale/id/fusiondirectory.po
+++ b/systems/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/systems/locale/it_IT/fusiondirectory.po b/systems/locale/it_IT/fusiondirectory.po
index af3e0498f682a966aad32fca37537494c2af61d6..60ad63e5c4da39a853e9f77f726dc028b2576bb4 100644
--- a/systems/locale/it_IT/fusiondirectory.po
+++ b/systems/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/systems/locale/lv/fusiondirectory.po b/systems/locale/lv/fusiondirectory.po
index 33e3cfc991b9f0fc423fb306fdf2d221a3613706..648256a0a69cd6de6f749d8dd8763ceb370fcb1a 100644
--- a/systems/locale/lv/fusiondirectory.po
+++ b/systems/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/systems/locale/nb/fusiondirectory.po b/systems/locale/nb/fusiondirectory.po
index 1882bbbc86f97bcab07909e5d11653801d16d1a5..57eaed144d1b162f1e7af7071af0446332acf1b8 100644
--- a/systems/locale/nb/fusiondirectory.po
+++ b/systems/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/systems/locale/nl/fusiondirectory.po b/systems/locale/nl/fusiondirectory.po
index 5dafc8fe404ffa027f0d1f42cf28ebedd37af902..a0fce037c39fa6f9ef595dd9b85b2b3b240cf8e9 100644
--- a/systems/locale/nl/fusiondirectory.po
+++ b/systems/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/systems/locale/pl/fusiondirectory.po b/systems/locale/pl/fusiondirectory.po
index 077bee370f42458438d7467d850db69b7c656f90..8947ecebc7e365a0d80ca861587c5b040e5da88c 100644
--- a/systems/locale/pl/fusiondirectory.po
+++ b/systems/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
 msgid "Network"
diff --git a/systems/locale/pt/fusiondirectory.po b/systems/locale/pt/fusiondirectory.po
index b9c26eb27969e14e014ca2e9490812c169575744..f4b38d67f03bd80e378480f3974a71aef421da49 100644
--- a/systems/locale/pt/fusiondirectory.po
+++ b/systems/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/systems/locale/pt_BR/fusiondirectory.po b/systems/locale/pt_BR/fusiondirectory.po
index 669b6b79a905c836abf79298894eef9ce7f658a5..5da18d06a18f1f8b3bb70b059957c54a3e0515c3 100644
--- a/systems/locale/pt_BR/fusiondirectory.po
+++ b/systems/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/systems/locale/ru/fusiondirectory.po b/systems/locale/ru/fusiondirectory.po
index 0d40a56715ec9acc702c4b5fc101dd110883e38f..2fd9c5143a0beff3ae5f8c411d0106255c4d4bd5 100644
--- a/systems/locale/ru/fusiondirectory.po
+++ b/systems/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/systems/locale/ru@petr1708/fusiondirectory.po b/systems/locale/ru@petr1708/fusiondirectory.po
index e5ccbfb8482b966af1e0e3935a780419a0622aca..fa862c562e97bf5fb3d8247134b41ba2313da87f 100644
--- a/systems/locale/ru@petr1708/fusiondirectory.po
+++ b/systems/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/systems/locale/sv/fusiondirectory.po b/systems/locale/sv/fusiondirectory.po
index d9f0e7d71c45cf8f3d1fa14f027bed9df21cef34..dc5991b55ad22c17553586651841a759acf8521f 100644
--- a/systems/locale/sv/fusiondirectory.po
+++ b/systems/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/systems/locale/ug/fusiondirectory.po b/systems/locale/ug/fusiondirectory.po
index df97a4103f15805c4b0d7e2be18a697bcfdb78f5..9a5ddaa84e33c26fe292d97f83d8e36c0cd4605b 100644
--- a/systems/locale/ug/fusiondirectory.po
+++ b/systems/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/systems/locale/vi_VN/fusiondirectory.po b/systems/locale/vi_VN/fusiondirectory.po
index 6f1123173d1d1ab6e535f7f22c5b0652f2f6744e..c0e4901831698b90f06dfff83e89b6f516532562 100644
--- a/systems/locale/vi_VN/fusiondirectory.po
+++ b/systems/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/systems/locale/zh/fusiondirectory.po b/systems/locale/zh/fusiondirectory.po
index c229889d1bc35cf0c47f2cd79c2d3dee56a0f778..48f35f77dd2580b4fae5ba60613bf567d866c104 100644
--- a/systems/locale/zh/fusiondirectory.po
+++ b/systems/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/user-reminder/locale/ar/fusiondirectory.po b/user-reminder/locale/ar/fusiondirectory.po
index 232e58e5f2be8021014fdc0302099a643f1bba51..a154b3de50825f27a7b1e0302e569aab355f7b70 100644
--- a/user-reminder/locale/ar/fusiondirectory.po
+++ b/user-reminder/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/user-reminder/locale/ca/fusiondirectory.po b/user-reminder/locale/ca/fusiondirectory.po
index 52ea644e188cf1ced7d2a9e337692295cedecd05..2ec57219912dc3cd70aae7e2301771e9383f2f0f 100644
--- a/user-reminder/locale/ca/fusiondirectory.po
+++ b/user-reminder/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/user-reminder/locale/cs_CZ/fusiondirectory.po b/user-reminder/locale/cs_CZ/fusiondirectory.po
index 47e1ce0d807aa064d0101cee00a927e17b74cea6..3135e04db5de14473e87d171ff4fb274828edc5b 100644
--- a/user-reminder/locale/cs_CZ/fusiondirectory.po
+++ b/user-reminder/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/user-reminder/locale/de/fusiondirectory.po b/user-reminder/locale/de/fusiondirectory.po
index d9740c1bf0b365f0c105e4c33e76cf1534695932..61ab25b7b1957bbf02208a01abc5ed58e0aa2ce4 100644
--- a/user-reminder/locale/de/fusiondirectory.po
+++ b/user-reminder/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/user-reminder/locale/el_GR/fusiondirectory.po b/user-reminder/locale/el_GR/fusiondirectory.po
index 125bef6ee07c39e890d2f78cfd8a8becd81f163d..070002f5a4b6a9dec39807afe1b065f61c310ee4 100644
--- a/user-reminder/locale/el_GR/fusiondirectory.po
+++ b/user-reminder/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/user-reminder/locale/en/fusiondirectory.po b/user-reminder/locale/en/fusiondirectory.po
index 4920d892ab1e7abdf80b6a4ff12572fba1ae8e48..5a95a1d0439ce6eac75f5641a6cbe21efc71cc7a 100644
--- a/user-reminder/locale/en/fusiondirectory.po
+++ b/user-reminder/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/user-reminder/locale/es/fusiondirectory.po b/user-reminder/locale/es/fusiondirectory.po
index bfc1e15b1415a1e6c66973230474247f190f91f7..10298aa8f2588dea8de3649967840470984836f8 100644
--- a/user-reminder/locale/es/fusiondirectory.po
+++ b/user-reminder/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
diff --git a/user-reminder/locale/es_CO/fusiondirectory.po b/user-reminder/locale/es_CO/fusiondirectory.po
index e17ee33feeb6cd0db59c431b3b9a997f428541b3..63fcd4270790c5cc0842af833fa4e7389a50d5d5 100644
--- a/user-reminder/locale/es_CO/fusiondirectory.po
+++ b/user-reminder/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
diff --git a/user-reminder/locale/es_VE/fusiondirectory.po b/user-reminder/locale/es_VE/fusiondirectory.po
index 26b9795516c2ceb60456db6bf9da122af7a83e24..9e17bc264440e8357a3a84e1f885ed8d208e4ced 100644
--- a/user-reminder/locale/es_VE/fusiondirectory.po
+++ b/user-reminder/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
diff --git a/user-reminder/locale/fa_IR/fusiondirectory.po b/user-reminder/locale/fa_IR/fusiondirectory.po
index 40eaafde6e2ae245a16f50b936e3b4e4885282ad..94ae5ccec355805231681dd092c9eaf8db049a3f 100644
--- a/user-reminder/locale/fa_IR/fusiondirectory.po
+++ b/user-reminder/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
diff --git a/user-reminder/locale/fi_FI/fusiondirectory.po b/user-reminder/locale/fi_FI/fusiondirectory.po
index 00710ae8c0ad84560daca33558e2b5f439126b8b..ee39c4f79cc72c2cc24137bff40e3d3b136f62e2 100644
--- a/user-reminder/locale/fi_FI/fusiondirectory.po
+++ b/user-reminder/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/user-reminder/locale/fr/fusiondirectory.po b/user-reminder/locale/fr/fusiondirectory.po
index a826d4aa2833a736b79aad0b374e4565e6b3a56b..95b4ae3101bbd268dda7614d51ddc18dde8d76b7 100644
--- a/user-reminder/locale/fr/fusiondirectory.po
+++ b/user-reminder/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/user-reminder/locale/hu_HU/fusiondirectory.po b/user-reminder/locale/hu_HU/fusiondirectory.po
index dc57337c8dcda3ef893ca60f76febe509dcc3f4b..47f58ba03bdd3bcdf30bb20f7686cd747cbddb69 100644
--- a/user-reminder/locale/hu_HU/fusiondirectory.po
+++ b/user-reminder/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/id/fusiondirectory.po b/user-reminder/locale/id/fusiondirectory.po
index 7bc5056fa9c7bb581d30f608b6107e03bf9b29dd..9a605732d20536d9d5e4a1f82e86a086757f874c 100644
--- a/user-reminder/locale/id/fusiondirectory.po
+++ b/user-reminder/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/it_IT/fusiondirectory.po b/user-reminder/locale/it_IT/fusiondirectory.po
index dacb17aa71c45bdf88acab8a685880f2f987441d..8881421e3c08d4f08254e6abd1e9f0b3043ebed8 100644
--- a/user-reminder/locale/it_IT/fusiondirectory.po
+++ b/user-reminder/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/user-reminder/locale/lv/fusiondirectory.po b/user-reminder/locale/lv/fusiondirectory.po
index 77aa2be4b13a6122c997496f21b00611e9ce792f..fc86037eec8ce14d21929908a590a5deedf5dbba 100644
--- a/user-reminder/locale/lv/fusiondirectory.po
+++ b/user-reminder/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/user-reminder/locale/nb/fusiondirectory.po b/user-reminder/locale/nb/fusiondirectory.po
index 13c4470a3676c3ca5fa1bb8f7fd680acee2464c5..c0c925f62c476c9801f192fd8802e336f8fd6d9c 100644
--- a/user-reminder/locale/nb/fusiondirectory.po
+++ b/user-reminder/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/user-reminder/locale/nl/fusiondirectory.po b/user-reminder/locale/nl/fusiondirectory.po
index eda01b9a8dcc812ef87c75dc2260268af8f84fea..6bbdefdded3c7f09a346f3b3c1bc39d45d224593 100644
--- a/user-reminder/locale/nl/fusiondirectory.po
+++ b/user-reminder/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/user-reminder/locale/pl/fusiondirectory.po b/user-reminder/locale/pl/fusiondirectory.po
index 9247b71953ea4718fa34172767637e6a6c9c36dd..0f1f062848e95e3420298c5827f9f0d2bdadf904 100644
--- a/user-reminder/locale/pl/fusiondirectory.po
+++ b/user-reminder/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
diff --git a/user-reminder/locale/pt/fusiondirectory.po b/user-reminder/locale/pt/fusiondirectory.po
index 6247cc654a2402a319eb22787b99bd7d1ebd1602..d08cfa75642b4c7e849c18c38564368dcb76b043 100644
--- a/user-reminder/locale/pt/fusiondirectory.po
+++ b/user-reminder/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/user-reminder/locale/pt_BR/fusiondirectory.po b/user-reminder/locale/pt_BR/fusiondirectory.po
index 959c848c27a98c77828f0a48b6bb4c96b4021059..6487d6316b637dba1608f39cccad1e0d9f143261 100644
--- a/user-reminder/locale/pt_BR/fusiondirectory.po
+++ b/user-reminder/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/user-reminder/locale/ru/fusiondirectory.po b/user-reminder/locale/ru/fusiondirectory.po
index 9942a050dc621ef04fbe2b846c0adc409e4b2df4..8db335e6ff5bc6211bd3c7a7ea6903f91f94ec8c 100644
--- a/user-reminder/locale/ru/fusiondirectory.po
+++ b/user-reminder/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/user-reminder/locale/ru@petr1708/fusiondirectory.po b/user-reminder/locale/ru@petr1708/fusiondirectory.po
index d514e2c3eb91e32f63da2f94d804b9b0df5ff879..6c8a760f565987a04d3aca46526d0e30f4b503fc 100644
--- a/user-reminder/locale/ru@petr1708/fusiondirectory.po
+++ b/user-reminder/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/sv/fusiondirectory.po b/user-reminder/locale/sv/fusiondirectory.po
index d487f774fde24e8ab862d8cd9887da34bc46f2da..2774390c68f715aa807a1f43421d23d8ecfd746f 100644
--- a/user-reminder/locale/sv/fusiondirectory.po
+++ b/user-reminder/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
diff --git a/user-reminder/locale/ug/fusiondirectory.po b/user-reminder/locale/ug/fusiondirectory.po
index 5f6437a57aa480a5cba8ffbf826912708b1397f8..68c57da9b8bb01cedc0adc6ce49657eaaceb6ecb 100644
--- a/user-reminder/locale/ug/fusiondirectory.po
+++ b/user-reminder/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/vi_VN/fusiondirectory.po b/user-reminder/locale/vi_VN/fusiondirectory.po
index b5e791d10d88c40de8f546a54089319a1b511202..fcc218fe214d2d8909f523bc4ff47acbe7d1b73b 100644
--- a/user-reminder/locale/vi_VN/fusiondirectory.po
+++ b/user-reminder/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/user-reminder/locale/zh/fusiondirectory.po b/user-reminder/locale/zh/fusiondirectory.po
index 558e9d6d4567ca521edc402daf10cc13e699b4de..e9da9d8cf76fc52c06fc4756738194f396147b7d 100644
--- a/user-reminder/locale/zh/fusiondirectory.po
+++ b/user-reminder/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
diff --git a/weblink/locale/ar/fusiondirectory.po b/weblink/locale/ar/fusiondirectory.po
index 0b5c0a7d10b6762419ea820b1fb59e2c7f1888fa..c474769a0e7a6c38a1188f00e33309939b1ef47a 100644
--- a/weblink/locale/ar/fusiondirectory.po
+++ b/weblink/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/ca/fusiondirectory.po b/weblink/locale/ca/fusiondirectory.po
index ea042c31b6e06900c43a203a98dfecd315f8603b..19960ddb32b3206c937ca69ac1d8a5a503333de7 100644
--- a/weblink/locale/ca/fusiondirectory.po
+++ b/weblink/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/cs_CZ/fusiondirectory.po b/weblink/locale/cs_CZ/fusiondirectory.po
index a136536f23b1626ed0a43a6160de74a6993bd883..c706cfccd0bd9d9e2d43e5fdb52bc7b13e1c3760 100644
--- a/weblink/locale/cs_CZ/fusiondirectory.po
+++ b/weblink/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
diff --git a/weblink/locale/de/fusiondirectory.po b/weblink/locale/de/fusiondirectory.po
index bb14ea5e8bdd6a7e95e6882913fd8115995bea97..04076d88dab9f1acfbd6d7cf1b53babc3fea9268 100644
--- a/weblink/locale/de/fusiondirectory.po
+++ b/weblink/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/weblink/locale/el_GR/fusiondirectory.po b/weblink/locale/el_GR/fusiondirectory.po
index 2f75040b49363008f5d051f00bfb1f88ab4f6a93..0dcce579c74928916d178b98fa029183d0402669 100644
--- a/weblink/locale/el_GR/fusiondirectory.po
+++ b/weblink/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
diff --git a/weblink/locale/en/fusiondirectory.po b/weblink/locale/en/fusiondirectory.po
index 6c2ad9e8971e4800a61334da9d204c7fd5202845..13f747190e18cea919129dcaa6d99b5bc47ea065 100644
--- a/weblink/locale/en/fusiondirectory.po
+++ b/weblink/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/weblink/locale/es/fusiondirectory.po b/weblink/locale/es/fusiondirectory.po
index c333d5d30c3e7af4833515149d59b531e9d0873d..5e1f8b112847059f6d20db15b4a1f39d4dbf9e38 100644
--- a/weblink/locale/es/fusiondirectory.po
+++ b/weblink/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/es_CO/fusiondirectory.po b/weblink/locale/es_CO/fusiondirectory.po
index 2f15c8f77f5fb4e1be7e283a61a1d13402f386dc..9ba1576965e929ce955e720507c52721a2976751 100644
--- a/weblink/locale/es_CO/fusiondirectory.po
+++ b/weblink/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/es_VE/fusiondirectory.po b/weblink/locale/es_VE/fusiondirectory.po
index 9fed7db2f102baf16a4e49dfce345a824eb58822..173786e8fb83baad276f3d86d483420c4bb46287 100644
--- a/weblink/locale/es_VE/fusiondirectory.po
+++ b/weblink/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/fa_IR/fusiondirectory.po b/weblink/locale/fa_IR/fusiondirectory.po
index bf864daf7e5b12c57567e78b5f0c629e86df4d22..9b160d044989bbdb7c25c04cd9825bb55ee38a38 100644
--- a/weblink/locale/fa_IR/fusiondirectory.po
+++ b/weblink/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/fi_FI/fusiondirectory.po b/weblink/locale/fi_FI/fusiondirectory.po
index d72b18ca46c45bc964c6f7405c913426b7e53646..61ca214ccedf42a6e2c788709972cfdc0b8ea4a5 100644
--- a/weblink/locale/fi_FI/fusiondirectory.po
+++ b/weblink/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/weblink/locale/fr/fusiondirectory.po b/weblink/locale/fr/fusiondirectory.po
index bd1f9ddc22d8804b4048ceb57b9fb4cbd72697d5..d20fb8208449cf8e8321f57f783b51507283f7b8 100644
--- a/weblink/locale/fr/fusiondirectory.po
+++ b/weblink/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/weblink/locale/hu_HU/fusiondirectory.po b/weblink/locale/hu_HU/fusiondirectory.po
index f85b38e5fae13742d3e1236964c12160f000f91d..1a252df7df310c5e768547f345f4ba9df51183cf 100644
--- a/weblink/locale/hu_HU/fusiondirectory.po
+++ b/weblink/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/id/fusiondirectory.po b/weblink/locale/id/fusiondirectory.po
index a23827dbf81f29e38720b157a40b204cc8eae714..0e469ba427986410e00052444c5053198f9aa1ea 100644
--- a/weblink/locale/id/fusiondirectory.po
+++ b/weblink/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/it_IT/fusiondirectory.po b/weblink/locale/it_IT/fusiondirectory.po
index 1d732ccca843d63b522e712bc975feb52c3dad71..0b80bf4c6fd5436d4d7f86123736c9a8fefb98e5 100644
--- a/weblink/locale/it_IT/fusiondirectory.po
+++ b/weblink/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/weblink/locale/lv/fusiondirectory.po b/weblink/locale/lv/fusiondirectory.po
index 6e4764204148c3f82b1882f3648d3fac53fd6d59..dc84fc4847d89f29eff68a684ca58a84e8851179 100644
--- a/weblink/locale/lv/fusiondirectory.po
+++ b/weblink/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/nb/fusiondirectory.po b/weblink/locale/nb/fusiondirectory.po
index 16fed493519fca1d2ec7f3d2b7ed9fe8bcb57957..a7e7bce0b0993d93a6e7733f86bc197d73a3d954 100644
--- a/weblink/locale/nb/fusiondirectory.po
+++ b/weblink/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/nl/fusiondirectory.po b/weblink/locale/nl/fusiondirectory.po
index b99a7328b033a67be17aacd638ff42b75da5adbf..a9b9de552fadf864292050bd76d89b120078d3ae 100644
--- a/weblink/locale/nl/fusiondirectory.po
+++ b/weblink/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/weblink/locale/pl/fusiondirectory.po b/weblink/locale/pl/fusiondirectory.po
index 432274b2dd5da20e247973104fc9549fa5541609..3864a8196001329734672738011652a329769d88 100644
--- a/weblink/locale/pl/fusiondirectory.po
+++ b/weblink/locale/pl/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: admin/systems/weblink/class_webLink.inc:31
 #: admin/systems/weblink/class_webLink.inc:44
diff --git a/weblink/locale/pt/fusiondirectory.po b/weblink/locale/pt/fusiondirectory.po
index 4ff6af7fa84fa85b23f7aacb77d480ac533ceb08..78d9c451dd301507ad9b769821cee50c3f6ba678 100644
--- a/weblink/locale/pt/fusiondirectory.po
+++ b/weblink/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/pt_BR/fusiondirectory.po b/weblink/locale/pt_BR/fusiondirectory.po
index e35906c2908eff2cfb4ddb3858a0648aeeec77ff..b4f4adb5c47c15da21d7d55ad94e9fb3926a945e 100644
--- a/weblink/locale/pt_BR/fusiondirectory.po
+++ b/weblink/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
diff --git a/weblink/locale/ru/fusiondirectory.po b/weblink/locale/ru/fusiondirectory.po
index f11ed950e1dce5c4dbebf4df1b0d3ac4b5a32b9d..f3a7e4d08981aa6d8b1dabaf268c3375836ce190 100644
--- a/weblink/locale/ru/fusiondirectory.po
+++ b/weblink/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
diff --git a/weblink/locale/ru@petr1708/fusiondirectory.po b/weblink/locale/ru@petr1708/fusiondirectory.po
index 4973297fa36ca5c59d3f43ff1375778feeb9a601..f76f01803127b3bfe399cdd0ec2af632310955f8 100644
--- a/weblink/locale/ru@petr1708/fusiondirectory.po
+++ b/weblink/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/sv/fusiondirectory.po b/weblink/locale/sv/fusiondirectory.po
index e7d2e8aa8177ef5ff858facdbace252dcac4dc7a..96ba2c500743c4d1c6b0aabb8b41a5e18ae3f002 100644
--- a/weblink/locale/sv/fusiondirectory.po
+++ b/weblink/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/ug/fusiondirectory.po b/weblink/locale/ug/fusiondirectory.po
index ecac266566c15ebde57ed1b4677c2997b2c4bfd0..5e09020b3b2b04a9eb313c412e04532089f7f890 100644
--- a/weblink/locale/ug/fusiondirectory.po
+++ b/weblink/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/vi_VN/fusiondirectory.po b/weblink/locale/vi_VN/fusiondirectory.po
index 7ecd2e6112cc2b8100ad7e7a6749231af92ba4c1..1b81d7e4d142c7239857d1c94d00e752a2ab6684 100644
--- a/weblink/locale/vi_VN/fusiondirectory.po
+++ b/weblink/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/zh/fusiondirectory.po b/weblink/locale/zh/fusiondirectory.po
index 70af69b79c2695f828c1ff22cc7e00173f5259af..06e681cfcb502a16ba43dc657185d7e3a646aae9 100644
--- a/weblink/locale/zh/fusiondirectory.po
+++ b/weblink/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/webservice/html/jsonrpc.php b/webservice/html/jsonrpc.php
index 9395832e8b89511883cc76fbc501fd534730eee4..926683a9a320333e1752722f095a3a4a6a092001 100644
--- a/webservice/html/jsonrpc.php
+++ b/webservice/html/jsonrpc.php
@@ -149,8 +149,6 @@ class fdRPCService
     }
     $this->ldap->cd($config->current['BASE']);
 
-    logging::log('debug', 'JSON-RPC', 'Method '.$method, array(), 'Params:'.print_r($params, TRUE));
-
     return call_user_func_array(array($this, '_'.$method), $params);
   }
 
diff --git a/webservice/locale/ar/fusiondirectory.po b/webservice/locale/ar/fusiondirectory.po
index e4772a73d350332257ed51286e4377fa1448c41d..0ca128546c47c05dfe23a1de5313fee4a8139e77 100644
--- a/webservice/locale/ar/fusiondirectory.po
+++ b/webservice/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ca/fusiondirectory.po b/webservice/locale/ca/fusiondirectory.po
index ad8c4d94d575f287ed236b0973ff7b509ac6698c..00155b6dd2d55ba5a1e43681297a8bb67d4162ab 100644
--- a/webservice/locale/ca/fusiondirectory.po
+++ b/webservice/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -49,40 +49,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Connector"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/cs_CZ/fusiondirectory.po b/webservice/locale/cs_CZ/fusiondirectory.po
index 9a675601e0e82456914eee310a058bae3f8b07c7..0003c739f9cf4e60257c950b174c08b65c3b14cd 100644
--- a/webservice/locale/cs_CZ/fusiondirectory.po
+++ b/webservice/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -49,40 +49,40 @@ msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Nemohu nalézt soubor '%s' – opravte to prosím spuštěním '%s' (na serveru)."
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "zásuvný modul"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "%s nelze smazat. Je uzamčeno %s."
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr "tato poukázka (token) je neplatná"
diff --git a/webservice/locale/de/fusiondirectory.po b/webservice/locale/de/fusiondirectory.po
index a4ca2cfdca8778c1fdecaa934c59f4d3bb67ad18..7ce9d6cc220c0c70191589c92b6e090123dffa47 100644
--- a/webservice/locale/de/fusiondirectory.po
+++ b/webservice/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -50,40 +50,40 @@ msgstr ""
 "Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu"
 " beseitigen"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr "Das Token ist nicht gültig"
diff --git a/webservice/locale/el_GR/fusiondirectory.po b/webservice/locale/el_GR/fusiondirectory.po
index 6d6552c166d78d1304402e8ee10899f1a08ae718..f32b6ed97447a8aee2c727a09fbcdf83b9a48ea3 100644
--- a/webservice/locale/el_GR/fusiondirectory.po
+++ b/webservice/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -51,40 +51,40 @@ msgstr ""
 "Αδυναμία εντοπισμού αρχείου '%s' - παρακαλώ εκτελέστε το '%s' για να το "
 "διορθώσετε"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Πρόσθετο"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Αδυναμία διαγραφής %s. Έχει κλειδωθεί από το  %s."
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/en/fusiondirectory.po b/webservice/locale/en/fusiondirectory.po
index 3c1c59c28a296c17ec6d0c0ce753ea9a2d15de94..e91868b68926c1785b31ef97e4e9ed92d7ef39f4 100644
--- a/webservice/locale/en/fusiondirectory.po
+++ b/webservice/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-06-01 10:49+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -47,42 +47,42 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid ""
 "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid ""
 "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/es/fusiondirectory.po b/webservice/locale/es/fusiondirectory.po
index 3373022077695b6cc91148311264383790a35ff8..4752f2d20e289448b8c558537a2b0ae9468676a5 100644
--- a/webservice/locale/es/fusiondirectory.po
+++ b/webservice/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -51,40 +51,40 @@ msgstr ""
 "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
 "solucionarlo"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Extensión"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
diff --git a/webservice/locale/es_CO/fusiondirectory.po b/webservice/locale/es_CO/fusiondirectory.po
index 816cc304cd8890f86bb8eaf1ba1cf8347890ec92..be020708007e630520c648e56608a076c04de13f 100644
--- a/webservice/locale/es_CO/fusiondirectory.po
+++ b/webservice/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -52,40 +52,40 @@ msgstr ""
 "No se encuentra el archivo '%s' - por favor ejecute '%s' para  arreglar "
 "esto."
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr "Este token es inválido"
diff --git a/webservice/locale/es_VE/fusiondirectory.po b/webservice/locale/es_VE/fusiondirectory.po
index bbdea1908243bfe2a035f66adbaec0e48d432a73..bc5104e2584c2bf131c6dc14ada5094687af2e8c 100644
--- a/webservice/locale/es_VE/fusiondirectory.po
+++ b/webservice/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -51,40 +51,40 @@ msgstr ""
 "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
 "solucionarlo"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Extensión"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
diff --git a/webservice/locale/fa_IR/fusiondirectory.po b/webservice/locale/fa_IR/fusiondirectory.po
index db1d0f67643c30b8b958101b321647b488a4206c..a63a25ee15cb30c4bb7b16cfe10fdf5d3ee06335 100644
--- a/webservice/locale/fa_IR/fusiondirectory.po
+++ b/webservice/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -48,40 +48,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "فایل '%s' را نمی توانم پیدا کنم برای رفع مشکل دستور '%s' را بزنید."
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "پلاگین"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/fi_FI/fusiondirectory.po b/webservice/locale/fi_FI/fusiondirectory.po
index 31b8d49b8d708daeaf3c5755a8d91f1805671ee7..bbfdb3748f7bc54bc641f0d211cb3f5e4e5414f8 100644
--- a/webservice/locale/fi_FI/fusiondirectory.po
+++ b/webservice/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/fr/fusiondirectory.po b/webservice/locale/fr/fusiondirectory.po
index 9a9667db41f860cb01737287ce71eda4e9648c03..62cfd4fab629106f361bbe23a55a394610d1904e 100644
--- a/webservice/locale/fr/fusiondirectory.po
+++ b/webservice/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -24,7 +24,7 @@ msgstr "Configuration du Service Web"
 
 #: config/class_webserviceConfig.inc:29
 msgid "FusionDirectory webservice plugin configuration"
-msgstr "Configuration du plugin Service Web"
+msgstr "Configuration du plugin webservice"
 
 #: config/class_webserviceConfig.inc:42
 msgid "Webservice"
@@ -49,47 +49,49 @@ msgstr ""
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
-"Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
+"Le fichier '%s' n’a pas été trouvé - veuillez exécuter '%s' pour régler ce "
+"problème"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
-msgstr "Extension"
+msgstr "Plugin"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
-msgstr "Impossible d’effacer %s. Il a été verrouillé par %s."
+msgstr "Impossible de supprimer %s. Il a été verrouillé par %s."
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 "Impossible d'obtenir la méthode de mot de passe pour le compte \"%s\". Le "
-"compte n'a pas été verrouillé !"
+"compte n'a pas été verrouillé !"
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
-"Méthode de mot de passe \"%s\" a échoué. Le compte \"%s\" n'a pas été "
-"verrouillé!"
+"La méthode de mot de passe \"%s\" a échoué. Le compte \"%s\" n'a pas été "
+"verrouillé !"
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-"Impossible de trouver le compte \"%s\" dans LDAP. Il n'a pas été verrouillé!"
+"Impossible de trouver le compte \"%s\" dans le LDAP. Il n'a pas été "
+"verrouillé !"
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr "Impossible d'obtenir la méthode de mot de passe pour le compte \"%s\""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
-msgstr "Impossible de trouver le compte \"%s\" dans LDAP"
+msgstr "Impossible de trouver le compte \"%s\" dans le LDAP"
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr "Le jeton n'est pas valide"
diff --git a/webservice/locale/hu_HU/fusiondirectory.po b/webservice/locale/hu_HU/fusiondirectory.po
index 06475456f82291f7b768c502885ca06b4a823033..48bc44e297d7e9c9babf7784c425526215c6ff41 100644
--- a/webservice/locale/hu_HU/fusiondirectory.po
+++ b/webservice/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/id/fusiondirectory.po b/webservice/locale/id/fusiondirectory.po
index 9eaa12510e1c8206775c65a4e3c49d369164bfc2..6723009d707ed8fb996551b3608b7617f3473596 100644
--- a/webservice/locale/id/fusiondirectory.po
+++ b/webservice/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/it_IT/fusiondirectory.po b/webservice/locale/it_IT/fusiondirectory.po
index d48110c985e355a7f2d3e9abcc4d5191d2c47ef4..c9fd5798532a7ec75396a16d6772faf0de76bc8d 100644
--- a/webservice/locale/it_IT/fusiondirectory.po
+++ b/webservice/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -50,44 +50,44 @@ msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Estensione"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Non puoi cancellare %s perché é ancora utilizzata da %s"
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 "Impossibile ottenere metodo di password per l'account\"%s\". Non è stato "
 "bloccato!"
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 "Il metodo di bloccaggio \"%s\" é fallito. L'account \"%s\" non é stato "
 "bloccato!"
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr "Account \"%s\" non trovato nella LDAP. Non é stato bloccato!"
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr "Impossibile ottenere metodo di password per l'account \"%s\". "
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr "Impossibile trovare  l'account \"%s\" nell'annuario LDAP"
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr "Questo token non è valido"
diff --git a/webservice/locale/lv/fusiondirectory.po b/webservice/locale/lv/fusiondirectory.po
index f01066021dd879e7aa32f9a9118898853b515cd5..0af909f2f8f23e9c70cc4762ce3bfac54e72351d 100644
--- a/webservice/locale/lv/fusiondirectory.po
+++ b/webservice/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/nb/fusiondirectory.po b/webservice/locale/nb/fusiondirectory.po
index e0a0ddc6fb1115b353457367175796f552a313a6..544d1e34b7f27154c655f6176d4d08aab8dad654 100644
--- a/webservice/locale/nb/fusiondirectory.po
+++ b/webservice/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/nl/fusiondirectory.po b/webservice/locale/nl/fusiondirectory.po
index d24443e49d74816501774ecbfee0657b3a94ab74..fd7700d674334c8a47ffd36c85daffa1361a7e0f 100644
--- a/webservice/locale/nl/fusiondirectory.po
+++ b/webservice/locale/nl/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Last-Translator: Joeri Puttevils <joeri.puttevils@connict.net>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,60 +32,61 @@ msgstr "Webservice"
 
 #: config/class_webserviceConfig.inc:45
 msgid "Force SSL"
-msgstr "SSL forceren"
+msgstr "SSL afdwingen"
 
 #: config/class_webserviceConfig.inc:45
 msgid "Allow only HTTPS JSON-RPC requests"
-msgstr "Enkel HTTP JSON-RPC aanvragen toeg"
+msgstr "Laat enkel HTTPS JSON-RPC-aanvragen toe"
 
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
+msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Afgebroken."
 
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Kan bestand '%s' niet vinden - gebruik aub '%s' om dit op te lossen"
+msgstr ""
+"Kan bestand '%s' niet vinden. Gelieve '%s' uit te voeren om dit op te lossen"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
-msgstr "%s kan niet verwijderd worden. Het is geblokkeerd door %s."
+msgstr "Kan %s niet verwijderen. Het is vergrendeld door %s."
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
-"Kan de wachtwoord methode niet opvragen voor account \"%s\". Het is niet "
-"geblokkeerd!"
+"Kan de wachtwoordmethode niet opvragen voor account \"%s\". Het is niet "
+"vergrendeld!"
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
-"Kan wachtwoord methode \"%s\" niet blokkeren. Het account \"%s\" is niet "
-"geblokkeerd."
+"Wachtwoordmethode \"%s\" kon niet vergrendelen. Account \"%s\" is niet "
+"vergrendeld!"
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
-msgstr "Kan het account \"%s\" niet vinden in LDAP. Het is niet geblokkeerd."
+msgstr "Account \"%s\" kon niet gevonden worden in LDAP. Het is niet vergrendeld."
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr "Kan de wachtwoord methode niet opvragen voor account \"%s\"."
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
-msgstr "Kan het account \"%s\" in LDAP niet vinden"
+msgstr "Account \"%s\" kon niet gevonden worden in LDAP"
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr "Deze token is niet geldig"
diff --git a/webservice/locale/pl/fusiondirectory.po b/webservice/locale/pl/fusiondirectory.po
index 8af62b9efb101b30fd5669dd4b7ce40dfac2e5e8..d3a55a5945ce11d537e1b51967f56024b706718e 100644
--- a/webservice/locale/pl/fusiondirectory.po
+++ b/webservice/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/class_webserviceConfig.inc:28
 msgid "Webservice configuration"
@@ -48,40 +48,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Dodatek"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/pt/fusiondirectory.po b/webservice/locale/pt/fusiondirectory.po
index 338fe86507aa3ca9f3a04bc04b2133837bb80a74..ec0867c63cacdb38190b55d9d1b2f75353d1c9c9 100644
--- a/webservice/locale/pt/fusiondirectory.po
+++ b/webservice/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/pt_BR/fusiondirectory.po b/webservice/locale/pt_BR/fusiondirectory.po
index 824892349b454022851ce7a5eae8313de8a1f1d6..48f44ae3cfea3d6e1b58fceb4c830cc6a2a1a6e5 100644
--- a/webservice/locale/pt_BR/fusiondirectory.po
+++ b/webservice/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -50,40 +50,40 @@ msgstr ""
 "Não foi possível localizar o arquivo '%s' - execute '%s' para solucionar o "
 "problema"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ru/fusiondirectory.po b/webservice/locale/ru/fusiondirectory.po
index a7aca580b80f3170fd6f24770e5f2529b4b7982d..34a31739eb936b1f58f9e7bc4f07384195bae913 100644
--- a/webservice/locale/ru/fusiondirectory.po
+++ b/webservice/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -50,40 +50,40 @@ msgstr ""
 "Не могу обнаружить файл '%s' - пожалуйста запустите '%s', чтобы исправить "
 "это."
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Плагин"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ru@petr1708/fusiondirectory.po b/webservice/locale/ru@petr1708/fusiondirectory.po
index d506482abc26af785989c58d0944585dc7080699..de732b8040f50a5b66f83a6e0bcc9a0a500bcfd0 100644
--- a/webservice/locale/ru@petr1708/fusiondirectory.po
+++ b/webservice/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/sv/fusiondirectory.po b/webservice/locale/sv/fusiondirectory.po
index 080952ecbb24c8a72b3173b4698edffca7e34835..72744f40e8dcaa3b0e482394d31948e3e6234ff7 100644
--- a/webservice/locale/sv/fusiondirectory.po
+++ b/webservice/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -49,40 +49,40 @@ msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Kan inte lokalisera filen '%s' - vänligen kör '%s' för att åtgärda detta"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ug/fusiondirectory.po b/webservice/locale/ug/fusiondirectory.po
index 7b4d294892ae8718e7ffd2be045475a91bbd952b..bd1e24ddcb6805cfbe600a71ff32c0ccbd998563 100644
--- a/webservice/locale/ug/fusiondirectory.po
+++ b/webservice/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/vi_VN/fusiondirectory.po b/webservice/locale/vi_VN/fusiondirectory.po
index 9601a2dc6f5dbd2fe169e9e397dd5007e940b8f3..729eb3771f10ea7959d0c1af79194beb7232e8fe 100644
--- a/webservice/locale/vi_VN/fusiondirectory.po
+++ b/webservice/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -49,40 +49,40 @@ msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Không thể xác định vị trí file '%s'- xin hãy chạy '%s' để sửa lỗi này!"
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/zh/fusiondirectory.po b/webservice/locale/zh/fusiondirectory.po
index 1019dbcbd7b73ea59edd8aa0c505001524257904..5ea8e14dd6951761306c1d601d1fc5f247557057 100644
--- a/webservice/locale/zh/fusiondirectory.po
+++ b/webservice/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-05-21 18:14+0200\n"
+"POT-Creation-Date: 2017-06-22 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:319 html/jsonrpc.php:402
+#: html/jsonrpc.php:317 html/jsonrpc.php:400
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:494
+#: html/jsonrpc.php:492
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:541 html/jsonrpc.php:570
+#: html/jsonrpc.php:539 html/jsonrpc.php:568
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:566
+#: html/jsonrpc.php:564
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:573
+#: html/jsonrpc.php:571
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:611 html/jsonrpc.php:620
+#: html/jsonrpc.php:609 html/jsonrpc.php:618
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:623
+#: html/jsonrpc.php:621
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:667
+#: html/jsonrpc.php:665
 msgid "This token is invalid"
 msgstr ""