diff --git a/alias/admin/alias/class_aliasManagement.inc b/alias/admin/alias/class_aliasManagement.inc
index 8199ad1c7235774424f22e9d07f1e7373e2cec31..e013cf7bfae75df01135528c6df9ee5675f737ff 100644
--- a/alias/admin/alias/class_aliasManagement.inc
+++ b/alias/admin/alias/class_aliasManagement.inc
@@ -26,7 +26,7 @@ class aliasManagement extends simpleManagement
 
   protected $autoFilterAttributes = array('dn', 'cn', 'description', 'aliasExpirationDate');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling  */
   public static function plInfo()
   {
     return array(
diff --git a/alias/admin/alias/class_mailAliasDistribution.inc b/alias/admin/alias/class_mailAliasDistribution.inc
index a44dd5f2cf322cdaac6a32d09494f57194bd5778..c0fd5a91a41e21ab45947541c840e0de5164a39e 100644
--- a/alias/admin/alias/class_mailAliasDistribution.inc
+++ b/alias/admin/alias/class_mailAliasDistribution.inc
@@ -24,7 +24,7 @@ class mailAliasDistribution extends simplePlugin
 
   var $objectclasses = array('top', 'mailAliasDistribution');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling  */
   public static function plInfo()
   {
     return array(
@@ -39,7 +39,7 @@ class mailAliasDistribution extends simplePlugin
         'ou'          => get_ou('aliasRDN'),
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/alias/admin/alias/class_mailAliasRedirection.inc b/alias/admin/alias/class_mailAliasRedirection.inc
index 069489a029f23233e36090cf6a27817343dd429f..b13a9594978d75c0a5830f3eb6ccdbe01d627b5f 100644
--- a/alias/admin/alias/class_mailAliasRedirection.inc
+++ b/alias/admin/alias/class_mailAliasRedirection.inc
@@ -24,7 +24,7 @@ class mailAliasRedirection extends simplePlugin
 
   var $objectclasses = array('top', 'mailAliasRedirection');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling  */
   public static function plInfo()
   {
     return array(
@@ -39,7 +39,7 @@ class mailAliasRedirection extends simplePlugin
         'ou'          => get_ou('aliasRDN'),
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/alias/config/alias/class_aliasConfig.inc b/alias/config/alias/class_aliasConfig.inc
index 67a08662be2362fadc1d76c06e575d4ecce53e13..4d168cbaf804e98b447bc3b7dfcf2e851f53159a 100644
--- a/alias/config/alias/class_aliasConfig.inc
+++ b/alias/config/alias/class_aliasConfig.inc
@@ -31,7 +31,7 @@ class aliasConfig extends simplePlugin
       "plCategory"      => array("configuration"),
       "plObjectType"    => array("smallConfig"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/alias/locale/ar/fusiondirectory.po b/alias/locale/ar/fusiondirectory.po
index adb5ca1163c2c24fa56373fc26b3036c367b3aca..d277d7e0426d8bda395de231b349a73c5e9dc37e 100644
--- a/alias/locale/ar/fusiondirectory.po
+++ b/alias/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "الوصف"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/ca/fusiondirectory.po b/alias/locale/ca/fusiondirectory.po
index 4077520042867b316226bcf9cc3dbaef75b34342..94ca4c1ed700e47e9c01c1a078932733d560598e 100644
--- a/alias/locale/ca/fusiondirectory.po
+++ b/alias/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nom"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/cs_CZ/fusiondirectory.po b/alias/locale/cs_CZ/fusiondirectory.po
index b2581da896f9df259faaa7f239e9061393e01f42..024879dcedbc8110dbe648d1107304c3f4f97c15 100644
--- a/alias/locale/cs_CZ/fusiondirectory.po
+++ b/alias/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -43,50 +43,50 @@ msgstr "Větev, ve které budou ukládány alternativní názvy"
 msgid "Temporary mail redirection"
 msgstr "Dočasné přesměrování e-mailů"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Přesměrování e-mailu"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Název"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Název identifikující toto přesměrování"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Popis"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Popis tohoto přesměrování"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Přesměrovat z"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "E-mailová adresa, ze které chcete přesměrovat"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Přesměrovat na"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Cíl tohoto přesměrování"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Datum skončení platnosti"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr "Datum, po kterém by mělo být toto přesměrování samočinně smazá
 msgid "Temporary mail distribution"
 msgstr "Dočasná distribuce e-mailů"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Distribuce e-mailů"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Název identifikující tento alternativní název"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Popis tohoto alternativního názvu"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "E-mailová adresa"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Alternativní e-mailové adresy"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Alternativa této e-mailové adresy"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "E-mailový server"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr "Poštovní server pro tento alternativní název"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr "Datum po kterém by měl být alternativní název automaticky smazán. Pro nemazání ponechte nevyplněné."
diff --git a/alias/locale/de/fusiondirectory.po b/alias/locale/de/fusiondirectory.po
index a42175b1448f865a178dc1eae5138132aac75306..179f220476111ad59b2413cdbe3f708353067da3 100644
--- a/alias/locale/de/fusiondirectory.po
+++ b/alias/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -44,50 +44,50 @@ msgstr "Zweig in welchem Aliase gespeichert werden"
 msgid "Temporary mail redirection"
 msgstr "Temporäre Mailumleitung"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Mailweiterleitung"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Name"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Name um diese Umleitung zu identifizieren"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Beschreibung dieser Umleitung"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Umleiten von"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Mailadressen von der Sie umleiten wollen"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Umleiten zu"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Ziel dieser Umleitung"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -99,39 +99,39 @@ msgstr "Datum nach dem die Umleitung gelöscht werden soll. Leer lassen für kei
 msgid "Temporary mail distribution"
 msgstr "Temporäre Mailverteilung"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Mailverteilung"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Name um dieses Alias zu identifizieren"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Beschreibung dieses Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Email-Adresse"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Emailaliase"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Aliase für diese Emailadresse"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Mailserver"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr "Datum nach dem das Alias gelöscht werden soll. Leer lassen damit nicht gelöscht wird."
diff --git a/alias/locale/el_GR/fusiondirectory.po b/alias/locale/el_GR/fusiondirectory.po
index 3bacea13716744fe012e3a4ce4b7177bf82299b1..3b51653bfb86c09cc197e9b28a939002277216b3 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -44,50 +44,50 @@ msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα al
 msgid "Temporary mail redirection"
 msgstr "Προσωρινή ανακατεύθυνση αλληλογραφίας"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Ανακατεύθυνση αλληλογραφίας"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Ένα όνομα με το οποίο θα αναγνωρίζεται αυτή η ανακατεύθυνση"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Περιγραφή αυτής της ανακατεύθυνσης"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Ανακατεύθυνση από"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Διεύθυνση αλληλογραφίας που θέλετε να ανακατευθύνετε"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Ανακατεύθυνση σε"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Προορισμός αυτής της ανακατεύθυνσης"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Ημερομηνία λήξης"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -99,39 +99,39 @@ msgstr "Ημερομηνία μετά από την οποία θα διαφρά
 msgid "Temporary mail distribution"
 msgstr "Προσωρινή διανομή αλληλογραφίας"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Διανομή αλληλογραφίας"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Ένα όνομα με το οποίο θα αναγνωρίζεται αυτό το alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Περιγραφή του alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Διευθύνση ηλεκτρονικής αλληλογγραφίας"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Aliases ηλ. αλληλογραφίας"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Aliases αυτής της διεύθυνσης e-mail "
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Εξυπηρετητής αλληλογραφίας"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr "Διακομιστής αλληλογραφίας για αυτό το alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr "Ημερομηνία μετά από την οποία θα διαφράφεται το alias. Κενό για μην διαγραφή"
diff --git a/alias/locale/en/fusiondirectory.po b/alias/locale/en/fusiondirectory.po
index f111e7c34feda4edd2d386cc5ed8811f9c1e20d2..7baf3cf2c30325145406785b900095cdb657d8b7 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,132 +17,132 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/alias/class_mailAliasDistribution.inc:31
-#: admin/alias/class_mailAliasDistribution.inc:32
-#: admin/alias/class_mailAliasDistribution.inc:35
-msgid "Temporary mail distribution"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
+#: admin/alias/class_mailAliasRedirection.inc:31
+#: admin/alias/class_mailAliasRedirection.inc:32
+#: admin/alias/class_mailAliasRedirection.inc:35
+msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
+#: admin/alias/class_mailAliasRedirection.inc:50
+msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
+msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: admin/alias/class_mailAliasRedirection.inc:53
+msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: admin/alias/class_mailAliasRedirection.inc:55
+msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: admin/alias/class_mailAliasRedirection.inc:60
+msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: admin/alias/class_mailAliasRedirection.inc:60
+msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:31
-#: admin/alias/class_mailAliasRedirection.inc:32
-#: admin/alias/class_mailAliasRedirection.inc:35
-msgid "Temporary mail redirection"
+#: admin/alias/class_mailAliasRedirection.inc:66
+msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
-msgid "Mail redirection"
+#: admin/alias/class_mailAliasRedirection.inc:66
+msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name to identify this redirection"
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
+msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description of this redirection"
+#: admin/alias/class_mailAliasRedirection.inc:71
+msgid ""
+"Date after which the redirection should be deleted. Leave empty for no "
+"deletion."
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
-msgid "Redirect from"
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
-msgid "Mail address from which you want to redirect"
+#: admin/alias/class_mailAliasDistribution.inc:51
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
-msgid "Redirect to"
+#: admin/alias/class_mailAliasDistribution.inc:54
+msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
-msgid "Destination of this redirection"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid ""
-"Date after which the redirection should be deleted. Leave empty for no "
-"deletion."
+#: admin/alias/class_mailAliasDistribution.inc:60
+msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:33
-msgid "Aliases"
+#: admin/alias/class_mailAliasDistribution.inc:65
+msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:65
+msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:70
+msgid "Mail server"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:70
+msgid "Mail server for this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:75
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
diff --git a/alias/locale/es/fusiondirectory.po b/alias/locale/es/fusiondirectory.po
index 04386f961e65548fbbfccf37324ab8100e7ee010..ded0bf2776e7d780e32d30daa3d8442847eb01cd 100644
--- a/alias/locale/es/fusiondirectory.po
+++ b/alias/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Servidor de correo"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/es_CO/fusiondirectory.po b/alias/locale/es_CO/fusiondirectory.po
index d8afe2af637431656f39a205c6e7c0ee0981c820..aaa93fe6af946ec4cdc5ce87e4e5c53fed3295fd 100644
--- a/alias/locale/es_CO/fusiondirectory.po
+++ b/alias/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/es_VE/fusiondirectory.po b/alias/locale/es_VE/fusiondirectory.po
index 7a78c5af0698ca0a5d181850497c4a02620d31fa..eae7da12560032a97bf9552071bf0c6ddfc78152 100644
--- a/alias/locale/es_VE/fusiondirectory.po
+++ b/alias/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Servidor de correo"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/fa_IR/fusiondirectory.po b/alias/locale/fa_IR/fusiondirectory.po
index 3faedd05ecb258081eb1cf4fc38a31073cfb33e4..e34ba646acf39e88412f10c50ccba45f42f09afe 100644
--- a/alias/locale/fa_IR/fusiondirectory.po
+++ b/alias/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/fi_FI/fusiondirectory.po b/alias/locale/fi_FI/fusiondirectory.po
index dca5fb1a40a0239391e7ed65ac3a97f93b00b8ce..ca2495532744b337a131a816143bbf38d2598395 100644
--- a/alias/locale/fi_FI/fusiondirectory.po
+++ b/alias/locale/fi_FI/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-01 11:40+0000\n"
 "Last-Translator: Dina Solveig Jalkanen\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -45,50 +45,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr "Väliaikainen sähköpostin edelleenlähetys"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Sähköpostin edelleenlähetys"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Nimeä edelleenlähetys"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Kuvaus"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Edelleenlähetyksen kuvaus"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Eräpäivä"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -100,39 +100,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr "Väliaikainen postijakelu"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Postijakelu"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Postipalvelin"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/fr/fusiondirectory.po b/alias/locale/fr/fusiondirectory.po
index dbdc811dbebb1722cd25a77cb82c7e156758872d..881ba1d2db34a252ac21dd5009d03a2c0d1ad604 100644
--- a/alias/locale/fr/fusiondirectory.po
+++ b/alias/locale/fr/fusiondirectory.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -47,50 +47,50 @@ msgstr "Branche dans laquelle les alias sont stockés"
 msgid "Temporary mail redirection"
 msgstr "Redirection temporaire de courriel"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Redirection de courriel"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nom"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Nom de la redirection de courriel"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Description"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Description de la redirection"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Rediriger depuis"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Adresse de courriel depuis laquelle vous voulez rediriger"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Rediriger vers"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Destination de la redirection"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Date d’expiration"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -102,39 +102,39 @@ msgstr "Date après laquelle cet alias doit être effacé. Laisser vide pour auc
 msgid "Temporary mail distribution"
 msgstr "Redistribution temporaire de courriel"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Redistribution de courriel"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Nom de l'alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Description de l'alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Adresse de courriel"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Alias de courriel"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Alias pour cette adresse de courriel"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Serveur de courriel"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr "Serveur de courriel pour cet alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: 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."
diff --git a/alias/locale/hu_HU/fusiondirectory.po b/alias/locale/hu_HU/fusiondirectory.po
index 666f195f82bf3fae0091565e81ea62c594096594..91d1bef5d5aca7cdd281f8bcf32163ba8bcd803b 100644
--- a/alias/locale/hu_HU/fusiondirectory.po
+++ b/alias/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Név"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Leírás"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/id/fusiondirectory.po b/alias/locale/id/fusiondirectory.po
index 5b62d1015cdc89b9cae1e4e90b4583db17c17f23..7c5d3a2477a1648840144123dfc9de74fde90def 100644
--- a/alias/locale/id/fusiondirectory.po
+++ b/alias/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/it_IT/fusiondirectory.po b/alias/locale/it_IT/fusiondirectory.po
index 6479316b4e2e4a3680e9f002c75e085ad2bd841c..bf40eb3713aeea8e7a73fa389a1c99a5f024a2d6 100644
--- a/alias/locale/it_IT/fusiondirectory.po
+++ b/alias/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:25+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -45,50 +45,50 @@ msgstr "Ramo nel quale gli alias saranno immagazzinati"
 msgid "Temporary mail redirection"
 msgstr "Redirezione mail temporanea"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Redirezione mail"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nome"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Nome per identificare questa redirezione"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Descrizione di questa redirezione"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Reindirizzare da"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Indirizzo mail dal quale volete reindirizzare"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Reindirizzare verso"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Destinazione di questa redirezione"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -100,39 +100,39 @@ msgstr "Data dopo la quale la redirezione sarà cancellata.Lasciare vuoto per no
 msgid "Temporary mail distribution"
 msgstr "Distribuzione mail temporanea"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Distribuzione mail"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Nome per identificare questo alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Descrizione di questo alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Indirizzo di posta elettronica"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Alias Email"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Alias per questo indirizzo email"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Server di posta elettronica"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr "Server mail per questo alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr "Data dopo la quale l'alias sarà cancellato. Lasciare vuoto per disabilitare la cancellazione."
diff --git a/alias/locale/lv/fusiondirectory.po b/alias/locale/lv/fusiondirectory.po
index 4b7bd4322fc552568ad61424373fea634fe1577a..9b54ab8d190017c9689f49409587f68bb88b5523 100644
--- a/alias/locale/lv/fusiondirectory.po
+++ b/alias/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr "Pagaidu pasta novirzīšana"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Pasta novirzīšana"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Nosaukums šīs novirzīšanas atpazīšanai"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Apraksts"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Novirzīšanas apraksts"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Novirzīt no"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Pasta adrese, kuru vēlaties novirzīt"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Novirzīt uz"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Šīs novirzīšanas saņēmējs"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Derīguma termiņš"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr "Datums, pēc kura novirzīšana jāizdzēš. Atstājite tukšu, ja nevē
 msgid "Temporary mail distribution"
 msgstr "Pagaidu pasta sadale"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Pasta sadale"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "E-pasta adrese"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Pasta serveris"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/nb/fusiondirectory.po b/alias/locale/nb/fusiondirectory.po
index 264de20c20df8b0c1d21f4e7ef08f2d184f03c1e..aa0eed9aff6b9613c88aaf4d0f6361d0a15f56ce 100644
--- a/alias/locale/nb/fusiondirectory.po
+++ b/alias/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Navn"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/nl/fusiondirectory.po b/alias/locale/nl/fusiondirectory.po
index 519c1ec31f2b83126a564b282de7ed00ff74dbd1..63a4e422daed3b41edb27ddd9abd79e9bf9cdc34 100644
--- a/alias/locale/nl/fusiondirectory.po
+++ b/alias/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -44,50 +44,50 @@ msgstr "Branch in welke de aliases zullen worden opgeslagen"
 msgid "Temporary mail redirection"
 msgstr "Tijdelijke mail redirectie"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Mail redirectie"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Naam"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Naam om deze redirectie te identificeren"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Beschrijving van de redirectie"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Omleiden van"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Mail adres dat je wilt omleiden"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Doorsturen naar"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Bestemming van deze omleiding"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -99,39 +99,39 @@ msgstr "Datum waarna de omleiding verwijderd moet worden. Laat leeg voor niet te
 msgid "Temporary mail distribution"
 msgstr "Tijdelijke mail distributielijst"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Mail distributie"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Naam om deze alias te identificeren"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Beschrijving van deze alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "E-mail adres"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Email aliases"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Aliases voor dit email adres"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Mail server"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr "Mail server voor deze alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr "Datum waarna de alias verwijderd zou moeten worden. Laat leeg indien de alias niet verwijderd moet worden."
diff --git a/alias/locale/pl/fusiondirectory.po b/alias/locale/pl/fusiondirectory.po
index 748c01ab9c455ff13ee4582758e9640347e73e98..561e3c2c1f515fa696b90e44ee1f350a9191afb8 100644
--- a/alias/locale/pl/fusiondirectory.po
+++ b/alias/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Opis"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Adres email"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Serwer pocztowy"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/pt/fusiondirectory.po b/alias/locale/pt/fusiondirectory.po
index d5f1812918b12c53017c1b3aaf926ca9a88bab40..9ffd5ed107f28e16c1d8d8f7a950611696dfbd84 100644
--- a/alias/locale/pt/fusiondirectory.po
+++ b/alias/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nome"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Descrição"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/pt_BR/fusiondirectory.po b/alias/locale/pt_BR/fusiondirectory.po
index 5e848cb4bca1beb95eacd0300dbc2294291148ae..231f802b709d1d065d71e9502b6d2ed211a00b9e 100644
--- a/alias/locale/pt_BR/fusiondirectory.po
+++ b/alias/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -43,50 +43,50 @@ msgstr "Filial onde as Aliases são armazenados"
 msgid "Temporary mail redirection"
 msgstr "Redirecionamento temporário de correio"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Redirecionamento de correio"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nome"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Nome para identificar este redirecionamento"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Descrição"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Descrição deste redirecionamento"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Redirecionar de"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Endereço de correio a partir do qual você quer redirecionar"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Redirecionar para"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Destino deste redirecionamento"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr "Data para que o redirecionamento seja eliminado. Deixe em branco para qu
 msgid "Temporary mail distribution"
 msgstr "Distribuição temporária de correio"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Distribuição de correio"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Nome para identificar este alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Descrição deste alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Aliases de email"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Aliases deste endereço de email"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "servidor de correio"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr "Data para que o alias seja eliminado. Deixe em branco para que não seja excluído."
diff --git a/alias/locale/ru/fusiondirectory.po b/alias/locale/ru/fusiondirectory.po
index e15cee93e952270ac84802a5908d3979471903d2..fa67bde9a4d83c7ce234d53909cd598f93731c93 100644
--- a/alias/locale/ru/fusiondirectory.po
+++ b/alias/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -45,50 +45,50 @@ msgstr "Ветка в которой будут храниться псевод
 msgid "Temporary mail redirection"
 msgstr "Временное перенаправление почты"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Перенаправление почты"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Название"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Название определяющее это перенаправление"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Описание"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Описание этого перенаправления"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Перенаправить откуда"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Адрес электронной почты с которого вы хотите перенаправлять"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Перенаправить куда"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Адрес назначения для этого перенаправления"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Дата окончания действия"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -100,39 +100,39 @@ msgstr "Дата после которой перенаправление буд
 msgid "Temporary mail distribution"
 msgstr "Временное распространение почты"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Распространение почты"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Имя определяющее этот псеводоним"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Описание псеводонима"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Адрес электронной почты"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Псевдонимы электронной почты"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Псевдонимы для адреса электронной почты"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Почтовый сервер"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr "Почтовый сервер для этого псевдонима"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr "Дата после которой псевдоним будет удален. Оставить пустым, если удалять не нужно."
diff --git a/alias/locale/ru@petr1708/fusiondirectory.po b/alias/locale/ru@petr1708/fusiondirectory.po
index c38a32a10ece75963d20dd72eed0280972ee8567..946e092324c1ad7bf7518cd6c75cec48e6f20106 100644
--- a/alias/locale/ru@petr1708/fusiondirectory.po
+++ b/alias/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/sv/fusiondirectory.po b/alias/locale/sv/fusiondirectory.po
index c19434dcfbd80b6c76a6c9b163ad6e8d902fbc66..30518e48a2166a29f3adf71108faaab6e6d9966d 100644
--- a/alias/locale/sv/fusiondirectory.po
+++ b/alias/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -43,50 +43,50 @@ msgstr "Gren där alias ska lagras"
 msgid "Temporary mail redirection"
 msgstr "Temporär omdirigering för epost"
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr "Epost-omdirigering"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Namn"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr "Namn för att identifiera omdirigeringen"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr "Beskrivning av omdirigeringen"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr "Omdirigera från"
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr "Epostadress från vilken du vill omdirigera"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr "Omdirigera till"
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr "Destination för omdirigeringen"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Utgångsdatum"
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr "Datum då omdirigeringen ska tas bort. Lämna tomt för att inte ta bort
 msgid "Temporary mail distribution"
 msgstr "Temporär epostdistribution"
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr "Epost-distribution"
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr "Namn för att att identifiera detta alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr "Beskrivning av alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "Epostadress"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr "Epostalias"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr "Alias för denna epostadress"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "Epostserver"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr "Datum efter vilket alias ska tas bort. Lämna tomt för att inte ta bort aliaset."
diff --git a/alias/locale/ug/fusiondirectory.po b/alias/locale/ug/fusiondirectory.po
index 301fd630794571582d774bda0ad2916e1901e57e..764eb07a9bb028d0850c5c02a2aca1c3cde0fea4 100644
--- a/alias/locale/ug/fusiondirectory.po
+++ b/alias/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/vi_VN/fusiondirectory.po b/alias/locale/vi_VN/fusiondirectory.po
index 979906b1b51a390af1c06ddf1beaead82c8ea64a..86d004c8da09e55635a12abddc064f75de4e245d 100644
--- a/alias/locale/vi_VN/fusiondirectory.po
+++ b/alias/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Tên"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Mô tả"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/alias/locale/zh/fusiondirectory.po b/alias/locale/zh/fusiondirectory.po
index 1e314ea77d2182906bc88b873ce644ccc6e4a948..7e7fda3b4401c06451dc357303417d8ec81eef0f 100644
--- a/alias/locale/zh/fusiondirectory.po
+++ b/alias/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:52
+#: admin/alias/class_mailAliasRedirection.inc:50
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "名称"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:53
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:57
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "描述"
 
-#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: admin/alias/class_mailAliasRedirection.inc:60
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:68
+#: admin/alias/class_mailAliasRedirection.inc:66
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasRedirection.inc:71
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
@@ -98,39 +98,39 @@ msgstr ""
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:53
+#: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:58
+#: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
+#: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
 msgstr "邮件地址"
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
+#: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
+#: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
diff --git a/applications/admin/applications/class_applicationGeneric.inc b/applications/admin/applications/class_applicationGeneric.inc
index 74322777aef592213b007e6129e4238ba0ebd01c..e78cce46220506a24f8100220e29bf1000fe000c 100644
--- a/applications/admin/applications/class_applicationGeneric.inc
+++ b/applications/admin/applications/class_applicationGeneric.inc
@@ -35,7 +35,7 @@ class application extends simplePlugin
         'icon'    => 'geticon.php?context=mimetypes&icon=application-x-executable&size=16',
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/applications/admin/applications/class_applicationManagement.inc b/applications/admin/applications/class_applicationManagement.inc
index dcd60ca7b2464357c3bc2038d94af414e3abdde2..d845a9e0fd0595ba102bbddc817abdf2f9cfc7cd 100644
--- a/applications/admin/applications/class_applicationManagement.inc
+++ b/applications/admin/applications/class_applicationManagement.inc
@@ -44,7 +44,7 @@ class applicationManagement extends simpleManagement
     if ($mode == 'none') {
       return array(array(), array());
     }
-    $entries = array();
+    $ldap = $config->get_ldap_link();
     if ($mode == 'all') {
       /* using raw to have the same results than with allowed mode */
       $apps = objects::ls(
@@ -66,19 +66,43 @@ class applicationManagement extends simpleManagement
         NULL,
         '(&(objectClass=fdApplicationRights)(roleOccupant='.$ui->dn.'))'
       );
-      $ldap = $config->get_ldap_link();
       foreach ($roles as $role) {
         foreach ($role['fdApplicationAllowed'] as $appdn) {
           if (!isset($apps[$appdn])) {
             $ldap->cat($appdn);
             if ($ldap->count()) {
-              $apps[$appdn] = $ldap->fetch();
+              $attrs = $ldap->fetch();
+              if (in_array_ics('fdWebApplication', $attrs['objectClass'])) {
+                $apps[$appdn] = $attrs;
+              }
             }
           }
         }
       }
     }
-    foreach ($apps as $app) {
+    ksort($apps);
+    $sections = array(
+      'webapps' => array('name' => _('Web applications'), 'priority' => 100)
+    );
+    $entries = array(
+      'webapps' => array()
+    );
+    foreach ($apps as $dn => $app) {
+      $base = preg_replace('/^[^,]+,'.preg_quote(get_ou('webappsRDN'), '/').'/', '', $dn);
+      $section = 'webapps';
+      if ($base != $config->current['BASE']) {
+        $ldap->cat($base, array('dn', 'ou', 'description'), '(&(ou=*)(description=*))');
+        if ($attrs = $ldap->fetch()) {
+          $section = $attrs['ou'][0];
+          if (!isset($sections[$section])) {
+            $sections[$section] = array(
+              'name'      => $attrs['description'][0],
+              'priority'  => 101
+            );
+            $entries[$section] = array();
+          }
+        }
+      }
       if (isset($app['fdApplicationImage'])) {
         $path = 'getbin.php?key=webapp_'.urlencode($app['cn'][0]);
         session::set('binarywebapp_'.$app['cn'][0].'type', 'image/png');
@@ -88,21 +112,19 @@ class applicationManagement extends simpleManagement
       } else {
         $path = 'plugins/applications/images/default_icon.png';
       }
-      $entries[] = array(
-        'NAME'        => $app['cn'][0],
-        'TITLE'       => $app['fdApplicationTitle'][0],
-        'DESCRIPTION' => $app['description'][0],
+      $name   = $app['cn'][0];
+      $title  = (isset($app['fdApplicationTitle'][0]) ? $app['fdApplicationTitle'][0] : $name);
+      $entries[$section][] = array(
+        'NAME'        => $name,
+        'TITLE'       => $title,
+        'DESCRIPTION' => (isset($app['description'][0]) ? $app['description'][0] : $title),
         'LINK'        => $app['labeledURI'][0],
         'ICONPATH'    => $path,
       );
     }
     return array(
-      array(
-        'webapps' => array('name' => _('Web applications'), 'priority' => 100)
-      ),
-      array(
-        'webapps' => $entries
-      )
+      $sections,
+      $entries
     );
   }
 }
diff --git a/applications/admin/applications/class_webApplication.inc b/applications/admin/applications/class_webApplication.inc
index c9b652c7caff777ae5adc079dbfe84521aed67a7..649d2b50a757e4789762efc0226fb9c27377b059 100644
--- a/applications/admin/applications/class_webApplication.inc
+++ b/applications/admin/applications/class_webApplication.inc
@@ -34,7 +34,7 @@ class webApplication extends simplePlugin
         'icon'        => 'geticon.php?context=categories&icon=applications-internet&size=16'
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -59,7 +59,7 @@ class webApplication extends simplePlugin
           ),
           new StringAttribute (
             _('Display Name'), _('Displayed name for links to this application'),
-            'fdApplicationTitle', FALSE
+            'fdApplicationTitle', TRUE
           ),
         )
       ),
diff --git a/applications/admin/roles/class_applicationRights.inc b/applications/admin/roles/class_applicationRights.inc
index eba6b43cd18fcb1d7a2bc1d76378c4eaee79153f..4ce74719647c336809233ec8c463bf5ed205ce78 100644
--- a/applications/admin/roles/class_applicationRights.inc
+++ b/applications/admin/roles/class_applicationRights.inc
@@ -34,7 +34,7 @@ class applicationRights extends simplePlugin
         'fdApplicationAllowed' => 'webApplication',
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/applications/config/applications/class_applicationsPluginConfig.inc b/applications/config/applications/class_applicationsPluginConfig.inc
index 953b9b765406b2f05142e5d3f528ed5c7c25c94c..dbb185f3489fe13ac2f77aaf02cc56ee917c0ff5 100644
--- a/applications/config/applications/class_applicationsPluginConfig.inc
+++ b/applications/config/applications/class_applicationsPluginConfig.inc
@@ -29,7 +29,7 @@ class applicationsPluginConfig extends simplePlugin
       'plDescription'   => _('Applications plugin configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/applications/locale/ar/fusiondirectory.po b/applications/locale/ar/fusiondirectory.po
index 948618d3c80fe17ddfe7a58fb90e7659c5cf3df0..482d7a904a865730688f6cd002296542a0cd8af4 100644
--- a/applications/locale/ar/fusiondirectory.po
+++ b/applications/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -69,7 +69,7 @@ msgstr "الكل"
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/ca/fusiondirectory.po b/applications/locale/ca/fusiondirectory.po
index 409bbbda44c471fd0201256d5b3a59a5cbf1936b..bab86435b29bedfa287eab20907814ee4892cea6 100644
--- a/applications/locale/ca/fusiondirectory.po
+++ b/applications/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/cs_CZ/fusiondirectory.po b/applications/locale/cs_CZ/fusiondirectory.po
index 0e75e40100ffcbe1bf12520c24d567f0eb7db3f8..f02b74a18d255b9e3fb4aa5b5fb5216209f7b2b9 100644
--- a/applications/locale/cs_CZ/fusiondirectory.po
+++ b/applications/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -69,7 +69,7 @@ msgstr "VÅ¡e"
 msgid "Application management"
 msgstr "Správa aplikací"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr "Webové aplikace"
 
diff --git a/applications/locale/de/fusiondirectory.po b/applications/locale/de/fusiondirectory.po
index edecbfb03cf32c71e28415f047409c249756a100..b9b310fb1499ab32be547fb48f0eec3284cfb3ae 100644
--- a/applications/locale/de/fusiondirectory.po
+++ b/applications/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -70,7 +70,7 @@ msgstr "Alle"
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr "Web Anwendungen"
 
diff --git a/applications/locale/el_GR/fusiondirectory.po b/applications/locale/el_GR/fusiondirectory.po
index cf430fb7f590dc59364bd762d736546daf16fd8b..3c2d25c9fe17ddae6add8e087f847c4f19e5cf6e 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -70,7 +70,7 @@ msgstr "Όλα"
 msgid "Application management"
 msgstr "Διαχείριση φαρμογών"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr "Εφρμογές Web"
 
diff --git a/applications/locale/en/fusiondirectory.po b/applications/locale/en/fusiondirectory.po
index 8b193b3bb070a8cddaa257b5299a3b22b5554a5d..7a2b9d9752efe01d903692c38e921988b14ce9ab 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,19 +17,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:82
 msgid "Web applications"
 msgstr ""
 
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/es/fusiondirectory.po b/applications/locale/es/fusiondirectory.po
index 5cd0670a67a247fac20af0886f39c62105835160..1f971e49a36ae030a2b55343f2fb792782dc71e5 100644
--- a/applications/locale/es/fusiondirectory.po
+++ b/applications/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -69,7 +69,7 @@ msgstr "Todo"
 msgid "Application management"
 msgstr "Administración de aplicación"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/es_CO/fusiondirectory.po b/applications/locale/es_CO/fusiondirectory.po
index 79910fb44a339257c7f9ffc178b5fe1d78ce512f..0a31bf44d81ddd3877282fc7d3e0295befe426bf 100644
--- a/applications/locale/es_CO/fusiondirectory.po
+++ b/applications/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/es_VE/fusiondirectory.po b/applications/locale/es_VE/fusiondirectory.po
index 6bd5bb355fa29269448708f44bba152f2ca8fc4a..a2c6108247f9dd0b6fc6255ec34beabd1c46622c 100644
--- a/applications/locale/es_VE/fusiondirectory.po
+++ b/applications/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -69,7 +69,7 @@ msgstr "Todo"
 msgid "Application management"
 msgstr "Administración de aplicación"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/fa_IR/fusiondirectory.po b/applications/locale/fa_IR/fusiondirectory.po
index fa65e62e51877f7bd27eaafb797e31de00c4b11e..5fcc37925f1f99a816535f93f6f57467aed091bf 100644
--- a/applications/locale/fa_IR/fusiondirectory.po
+++ b/applications/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/fi_FI/fusiondirectory.po b/applications/locale/fi_FI/fusiondirectory.po
index da40b22d8dee81da03c384a9312d32c2c5574fc8..0d08eac96a259471511847cc4870e87993aa05ca 100644
--- a/applications/locale/fi_FI/fusiondirectory.po
+++ b/applications/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -69,7 +69,7 @@ msgstr "Kaikki"
 msgid "Application management"
 msgstr "Sovellusten hallinta"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr "Web-sovellus"
 
diff --git a/applications/locale/fr/fusiondirectory.po b/applications/locale/fr/fusiondirectory.po
index 88a7e90e1239aa06bb9ebdc2bcf27bd21bec3259..1583e1603b445b20d03b1b2bfb1edb8e888e487b 100644
--- a/applications/locale/fr/fusiondirectory.po
+++ b/applications/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -71,7 +71,7 @@ msgstr "Toutes"
 msgid "Application management"
 msgstr "Gestion des applications"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr "Applications web"
 
diff --git a/applications/locale/hu_HU/fusiondirectory.po b/applications/locale/hu_HU/fusiondirectory.po
index b3d4314aba256cb9a1d7f70f6b8223a6f7e76afb..bbc404197b381dc4cd6a0884fb0351b1285af362 100644
--- a/applications/locale/hu_HU/fusiondirectory.po
+++ b/applications/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/id/fusiondirectory.po b/applications/locale/id/fusiondirectory.po
index f0616ccb3be72cd6a4a289d8a96cff4f0402a6d1..8876b944796a6bc32477cd6e4c656abdecea7a47 100644
--- a/applications/locale/id/fusiondirectory.po
+++ b/applications/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/it_IT/fusiondirectory.po b/applications/locale/it_IT/fusiondirectory.po
index 6d0b71c0acc808b752ec13edbe58d3cb19179957..afe7ccd212e6580e0ffc4fee8e95a1c89473bd1c 100644
--- a/applications/locale/it_IT/fusiondirectory.po
+++ b/applications/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -71,7 +71,7 @@ msgstr "Tutto"
 msgid "Application management"
 msgstr "Gestione dell'applicazione"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr "Applicazioni Web"
 
diff --git a/applications/locale/lv/fusiondirectory.po b/applications/locale/lv/fusiondirectory.po
index ebf45ebe76f47ea8f2bb4a57f9152ff80bc823b6..7acd3a68de0d9c20c113112cd51e178268efe26f 100644
--- a/applications/locale/lv/fusiondirectory.po
+++ b/applications/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -69,7 +69,7 @@ msgstr "Visi "
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/nb/fusiondirectory.po b/applications/locale/nb/fusiondirectory.po
index c3df349c8568f080602dc79a48682c3ac58a6383..162f72b1ebc0f8f3641e667982d596f6d8a6b432 100644
--- a/applications/locale/nb/fusiondirectory.po
+++ b/applications/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/nl/fusiondirectory.po b/applications/locale/nl/fusiondirectory.po
index 2a6aebf24399a4d46500b0f07237358981b7e868..3b9fd4a546307f6ef60d9fb1f4ba7667573fe1f9 100644
--- a/applications/locale/nl/fusiondirectory.po
+++ b/applications/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -69,7 +69,7 @@ msgstr "Alle"
 msgid "Application management"
 msgstr "Programma beheer"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/pl/fusiondirectory.po b/applications/locale/pl/fusiondirectory.po
index fceef13e697d70dc430c3c94e6b1d53720b4637d..dcbfa3679343230924edd8c06465768115a0ff70 100644
--- a/applications/locale/pl/fusiondirectory.po
+++ b/applications/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -69,7 +69,7 @@ msgstr "Wszystkie"
 msgid "Application management"
 msgstr "ZarzÄ…dzanie aplikacjÄ…"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/pt/fusiondirectory.po b/applications/locale/pt/fusiondirectory.po
index b43dbaf683b686c2792e90781f45b9c531159395..27bab1932acf8396470a8ac59ea44d4f7a61f0cc 100644
--- a/applications/locale/pt/fusiondirectory.po
+++ b/applications/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/pt_BR/fusiondirectory.po b/applications/locale/pt_BR/fusiondirectory.po
index ad18362b65292a35146a12fdffd805ebd93881b8..9d251f8784988b19950da97f7bf73a449fad7d38 100644
--- a/applications/locale/pt_BR/fusiondirectory.po
+++ b/applications/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -69,7 +69,7 @@ msgstr "Todos"
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/ru/fusiondirectory.po b/applications/locale/ru/fusiondirectory.po
index d80653d71b41a994e982e593b308c34bff601f56..359fd420d28ce7304883aff3705eaa540526d544 100644
--- a/applications/locale/ru/fusiondirectory.po
+++ b/applications/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -69,7 +69,7 @@ msgstr "Все"
 msgid "Application management"
 msgstr "Управление приложениями"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/ru@petr1708/fusiondirectory.po b/applications/locale/ru@petr1708/fusiondirectory.po
index 5f9ed62cca295323d193f10cc2218beabf5d8fc8..6527d21bac30acf1dc3de1095831a516fb322fae 100644
--- a/applications/locale/ru@petr1708/fusiondirectory.po
+++ b/applications/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/sv/fusiondirectory.po b/applications/locale/sv/fusiondirectory.po
index 0aa195ccc6534945f705ea354906ee51d3e009e3..89c360c24cac737112c9a8cc48bdc895aebbc8b4 100644
--- a/applications/locale/sv/fusiondirectory.po
+++ b/applications/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/ug/fusiondirectory.po b/applications/locale/ug/fusiondirectory.po
index 3abdc8e49871c25f45eada3f108bdcdbb7443e90..2b843f8aa35a3813535920dec077c03f537c7886 100644
--- a/applications/locale/ug/fusiondirectory.po
+++ b/applications/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/vi_VN/fusiondirectory.po b/applications/locale/vi_VN/fusiondirectory.po
index 02632bfd6a8119d3c26350877993e2fa889ab7d6..65739deb8f4ffe253d4d7e3293b5bf66aa738302 100644
--- a/applications/locale/vi_VN/fusiondirectory.po
+++ b/applications/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/applications/locale/zh/fusiondirectory.po b/applications/locale/zh/fusiondirectory.po
index c78624540bbc1cd8bffb3af20e8eacee5fdca729..44ef29e5502a64bc81a5f275f935c160fd5466d9 100644
--- a/applications/locale/zh/fusiondirectory.po
+++ b/applications/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -69,7 +69,7 @@ msgstr "全部"
 msgid "Application management"
 msgstr "应用程序管理"
 
-#: admin/applications/class_applicationManagement.inc:101
+#: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
 msgstr ""
 
diff --git a/argonaut/addons/argonaut/class_argonautAction.inc b/argonaut/addons/argonaut/class_argonautAction.inc
index c2f2558923f95917433c1dced8daa06eddc168cc..92c14883576c50ba62a26fd7f998c9946309ecef 100644
--- a/argonaut/addons/argonaut/class_argonautAction.inc
+++ b/argonaut/addons/argonaut/class_argonautAction.inc
@@ -86,7 +86,7 @@ class argonautAction extends simplePlugin
         'icon'        => 'geticon.php?context=applications&icon=argonaut&size=16',
       )),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/addons/argonaut/class_argonautEventTypes.inc b/argonaut/addons/argonaut/class_argonautEventTypes.inc
index eb8709bc3df08c1c430506192cbfa20486ec3644..f94e8c145172b99a0d496f8d6c920eb3e9156fe1 100644
--- a/argonaut/addons/argonaut/class_argonautEventTypes.inc
+++ b/argonaut/addons/argonaut/class_argonautEventTypes.inc
@@ -46,11 +46,11 @@ class argonautEventTypes
   }
 
   /*! \brief  Returns event information, like menu strings, images ...
-    @return   Array Event informations.
+    @return   Array Event information.
    */
   static public function get_event_info($action)
   {
-    $events = self::get_event_types();
+    $events = static::get_event_types();
     if (isset($events[$action])) {
       $infos = $events[$action];
 
diff --git a/argonaut/addons/argonaut/class_argonautImportFile.inc b/argonaut/addons/argonaut/class_argonautImportFile.inc
index 0e551733b41f044feb6774d9d22886639aa84ae8..3cb00029c8f19ca8449d667a0e11c54ea5ff5942 100644
--- a/argonaut/addons/argonaut/class_argonautImportFile.inc
+++ b/argonaut/addons/argonaut/class_argonautImportFile.inc
@@ -38,7 +38,7 @@ class argonautImportFile extends simplePlugin
         'icon'        => 'geticon.php?context=applications&icon=argonaut&size=16',
       )),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/admin/systems/argonaut/class_argonautClient.inc b/argonaut/admin/systems/argonaut/class_argonautClient.inc
index 7c0951fd12e49085d54d448d9ba78f76d48c25fb..11dbc44d73f694841e1241f7d3c2ae870ace4cce 100644
--- a/argonaut/admin/systems/argonaut/class_argonautClient.inc
+++ b/argonaut/admin/systems/argonaut/class_argonautClient.inc
@@ -69,10 +69,10 @@ class ArgonautServiceNameAttribute extends CompositeAttribute
 
     foreach ($services as $tab) {
       $name = $tab['CLASS'];
-      if (in_array($name, self::$argonautService_blacklist)) {
+      if (in_array($name, static::$argonautService_blacklist)) {
         continue;
       }
-      $value = (isset(self::$argonautService_defaults[$name])?self::$argonautService_defaults[$name]:"");
+      $value = (isset(static::$argonautService_defaults[$name])?static::$argonautService_defaults[$name]:"");
       $this->attributes[$name] = new StringAttribute ($name, "Service $name",
                                                       "service_$name", FALSE,
                                                       $value, $this->getAcl());
@@ -119,7 +119,7 @@ class argonautClient extends simplePlugin
       'plSelfModify'    => FALSE,
       'plObjectType'    => array('workstation','server','ogroup-dynamic'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc b/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
index f2b346346c404d3dcc27a979c0ba9f071f7c984c..5a5df844fa348c86d4c312c7a2f9e070af340309 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
@@ -23,7 +23,7 @@ class argonautDNSConfig extends simpleService
   var $objectclasses  = array('argonautDNSConfig');
   var $showActions    = FALSE;
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -31,7 +31,7 @@ class argonautDNSConfig extends simpleService
       'plDescription'   => _('Argonaut DNS settings').' ('._('Services').')',
       'plIcon'          => 'geticon.php?context=applications&icon=argonaut-dns&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc b/argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc
index 2985924023bc2520276220b8d880f4f861529efc..610d45a6f1d570aecd6bf70e45e77e51aaa57002 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc
@@ -23,7 +23,7 @@ class argonautFuseConfig extends simpleService
 {
   var $objectclasses  = array('argonautFuseConfig');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -31,7 +31,7 @@ class argonautFuseConfig extends simpleService
       'plDescription'   => _('Argonaut Fuse settings'),
       'plIcon'          => 'geticon.php?context=applications&icon=argonaut-fuse&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc b/argonaut/admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc
index 07f8dc01449263a2ac6853ab1ea5721a1dd5ec41..d21e92312d16d79c10af15b1c176bdc3887269a4 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc
@@ -25,7 +25,7 @@ class argonautFuseFAIConfig extends simplePlugin
   var $showActions    = FALSE;
   var $displayHeader     = TRUE;
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -33,7 +33,7 @@ class argonautFuseFAIConfig extends simplePlugin
       "plDescription"   => _("Argonaut Fuse FAI module settings")." ("._("Services").")",
       "plCategory"      => array("server"),
       "plObjectType"    => array("fusemodule"),
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc b/argonaut/admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc
index 5f4704a47ffe3b98323d296a1629f0c2e9790dfc..78bc7688d9f4638bebb82ac5e6851f6585420634 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc
@@ -25,7 +25,7 @@ class argonautFuseLTSPConfig extends simplePlugin
   var $showActions    = FALSE;
   var $displayHeader  = TRUE;
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -33,7 +33,7 @@ class argonautFuseLTSPConfig extends simplePlugin
       'plDescription'   => _('Argonaut Fuse LTSP module settings').' ('._('Services').')',
       'plCategory'      => array('server'),
       'plObjectType'    => array('fusemodule'),
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc b/argonaut/admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc
index 0ec8f4d009050183c8e6888f608e9333d1f03bfa..48a6858fdcc1cf98cd5e491b365360fb96dffa62 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc
@@ -25,7 +25,7 @@ class argonautFuseOPSIConfig extends simplePlugin
   var $showActions    = FALSE;
   var $displayHeader     = TRUE;
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -33,7 +33,7 @@ class argonautFuseOPSIConfig extends simplePlugin
       "plDescription"   => _("Argonaut Fuse OPSI module settings")." ("._("Services").")",
       "plCategory"      => array("server"),
       "plObjectType"    => array("fusemodule"),
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautMirrorConfig.inc b/argonaut/admin/systems/services/argonaut/class_argonautMirrorConfig.inc
index 48142ead46335d9df36cf50a58c9882a88279f7a..88322f41b87420bf174b1be233cacf79d31c773e 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautMirrorConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautMirrorConfig.inc
@@ -30,7 +30,7 @@ class argonautMirrorConfig extends simpleService
       'plDescription'   => _('Argonaut Mirror settings'),
       'plIcon'          => 'geticon.php?context=applications&icon=argonaut-mirror&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautServer.inc b/argonaut/admin/systems/services/argonaut/class_argonautServer.inc
index da4a5aba93808ebeb25fad61da51fe30b16be2fa..662448ded212d600ec4edac9f3eaf2e031f02ef4 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautServer.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautServer.inc
@@ -24,7 +24,7 @@ class argonautServer extends simpleService
   /* This plugin only writes its objectClass */
   var $objectclasses  = array("argonautServer");
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -32,7 +32,7 @@ class argonautServer extends simpleService
       'plDescription' => _('Argonaut server').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=applications&icon=argonaut&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -52,7 +52,7 @@ class argonautServer extends simpleService
             TRUE
           ),
           new BooleanAttribute (
-            _('Get packages informations'),
+            _('Get packages information'),
             _('Wether or not argonaut server should get packages information from repositories at start and then once a day. Needed for FAI package list creation.'),
             'argonautFetchPackages', FALSE,
             TRUE
diff --git a/argonaut/include/class_supportDaemon.inc b/argonaut/include/class_supportDaemon.inc
index bd10337717627396dfd54a8cb8cf600e434e531d..f2f6a7ffbee2f57e6b8e6cbc6d3b3da67fff9ead 100644
--- a/argonaut/include/class_supportDaemon.inc
+++ b/argonaut/include/class_supportDaemon.inc
@@ -100,7 +100,7 @@ class supportDaemon
           );
           $sshaMethod = new passwordMethodssha();
           $this->http_options['header'] = 'Authorization: Basic '.base64_encode('fd:'.$sshaMethod->generate_hash($ldap_infos['argonautServerToken'][0]));
-        };
+        }
       }
       return $ldap_infos['argonautProtocol'][0]."://".$ldap_infos['ipHostNumber'][0].":".$ldap_infos['argonautPort'][0];
     } elseif ($ldap->count() > 1) {
@@ -190,8 +190,6 @@ class supportDaemon
 
     /* Append an entry */
     return $this->append_call($event->action, $event->targets, $event->computeData());
-
-    return FALSE;
   }
 
   /*!
@@ -541,7 +539,7 @@ class supportDaemon
   }
 
   /*!
-   * \brief  Returns log file informations for a given mac address
+   * \brief  Returns log file information for a given mac address
    *
    * \param  string $mac The mac address to fetch logs for.
    *
@@ -779,6 +777,6 @@ class supportDaemon
       return $this->new_state(FALSE);
     }
   }
-};
+}
 
 ?>
diff --git a/argonaut/include/jsonRPCClient.php b/argonaut/include/jsonRPCClient.php
index df0084996c36ff3ead92c1d11191bf1a1066826f..598e96c329e573af16db64e5db310ac74614c4de 100644
--- a/argonaut/include/jsonRPCClient.php
+++ b/argonaut/include/jsonRPCClient.php
@@ -27,10 +27,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * Source code for class jsonRPCClient
  */
 
-class jsonRPCClient_RequestErrorException extends Exception {};
-class jsonRPCClient_NetworkErrorException extends Exception {};
-class jsonRPCClient_ProtocolException extends Exception {};
-class jsonRPCClient_BadArgsException extends Exception {};
+class jsonRPCClient_Exception extends Exception {}
+class jsonRPCClient_RequestErrorException extends jsonRPCClient_Exception {}
+class jsonRPCClient_NetworkErrorException extends jsonRPCClient_Exception {}
+class jsonRPCClient_ProtocolException extends jsonRPCClient_Exception {}
+class jsonRPCClient_BadArgsException extends jsonRPCClient_Exception {}
 
 /*!
  * \brief The object of this class are generic jsonRPC 1.0 clients
@@ -202,19 +203,14 @@ class jsonRPCClient {
         break;
         case JSON_ERROR_DEPTH:
           throw new jsonRPCClient_ProtocolException('Maximum depth in response');
-        break;
         case JSON_ERROR_STATE_MISMATCH:
           throw new jsonRPCClient_ProtocolException('Invalid JSON in response');
-        break;
         case JSON_ERROR_CTRL_CHAR:
           throw new jsonRPCClient_ProtocolException('Error while checking chars in response');
-        break;
         case JSON_ERROR_SYNTAX:
           throw new jsonRPCClient_ProtocolException('Bad JSON syntax in response');
-        break;
         case JSON_ERROR_UTF8:
           throw new jsonRPCClient_ProtocolException('Bad UTF-8 in response');
-        break;
         default:
         break;
       }
diff --git a/argonaut/locale/ar/fusiondirectory.po b/argonaut/locale/ar/fusiondirectory.po
index f7c1d7ce89895bec7c8929e468d9a5b4dcc55858..4d6f226b14f8aeb837962ab890cbe07959cf8739 100644
--- a/argonaut/locale/ar/fusiondirectory.po
+++ b/argonaut/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/ca/fusiondirectory.po b/argonaut/locale/ca/fusiondirectory.po
index fb2c694759c2bb040b63345c639ecd90afc9bad1..44536d22324b0dc9be6cffca90d9b0df241f34a9 100644
--- a/argonaut/locale/ca/fusiondirectory.po
+++ b/argonaut/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/cs_CZ/fusiondirectory.po b/argonaut/locale/cs_CZ/fusiondirectory.po
index 9b672b1e974d37ad69c54df360aea9662d8135aa..de0d1c84aff0da8c416aed88df8573d4cd0f215a 100644
--- a/argonaut/locale/cs_CZ/fusiondirectory.po
+++ b/argonaut/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,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:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Nelze načíst %s!"
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "%s není soubor!"
@@ -582,8 +582,8 @@ msgid ""
 msgstr "Zda argonaut server má mazat úlohy po jejich úspěšném dokončení"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr "Získat informace o balíčcích"
+msgid "Get packages information"
+msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
 msgid ""
diff --git a/argonaut/locale/de/fusiondirectory.po b/argonaut/locale/de/fusiondirectory.po
index 55907a7fc705150fb9f8eecde6f25224b2f7c6b6..dd44408668e2e37321bc54cf654b9b3b6dccc793 100644
--- a/argonaut/locale/de/fusiondirectory.po
+++ b/argonaut/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,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:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "\"%s\" konnte nicht gelesen werden!"
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" ist keine Datei!"
@@ -582,8 +582,8 @@ msgid ""
 msgstr "Ob der argonaut-Server erfolgreich abgeschlossene Aufgaben löschen soll"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr "Paketinformationen holen"
+msgid "Get packages information"
+msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
 msgid ""
diff --git a/argonaut/locale/el_GR/fusiondirectory.po b/argonaut/locale/el_GR/fusiondirectory.po
index 21e0c15d90ac60756fb2ff896815e264b047d494..a921b930f99dbe1e7736fc67368f312c8f09c35e 100644
--- a/argonaut/locale/el_GR/fusiondirectory.po
+++ b/argonaut/locale/el_GR/fusiondirectory.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -29,12 +29,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Αδύνατη η ανάγνωση του \"%s\"!"
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "Το \"%s\" δεν είναι αρχείο!"
@@ -586,8 +586,8 @@ msgid ""
 msgstr "Αν ο διακομιστής argonaut θα πρέπει να διαγράφει της επιτυχώς ολοκληρωμένες διεργασίες ή όχι"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr "Πάρε τις πληροφορίες των πακέτων"
+msgid "Get packages information"
+msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
 msgid ""
diff --git a/argonaut/locale/en/fusiondirectory.po b/argonaut/locale/en/fusiondirectory.po
index c739aadf220f97e56917d38d927126dd08723a0a..ebfe97d85eaf0d8d442b4211b1dd733eca2feb26 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,718 +17,719 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:608
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be "
-"relatively big and can change frequently)"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:31
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautServer.inc:46
-msgid "Argonaut server"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid "Wether or not argonaut server should delete successfully finished tasks"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:56
-msgid ""
-"Wether or not argonaut server should get packages information from "
-"repositories at start and then once a day. Needed for FAI package list "
-"creation."
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid "Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-msgid "Argonaut Fuse OPSI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
-msgid "OPSI"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
-msgid "Opsi admin"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
-msgid "Opsi password"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:60
-msgid "Opsi server"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:65
-msgid "Opsi lang"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-msgid "Argonaut DNS settings"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
-msgid "Argonaut Ldap2zone settings:"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
-msgid "Bind directory"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
-msgid "The directory in which conf file must be created"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:56
-msgid "Bind cache directory"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:57
-msgid "The directory in which zone files must be created"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
-msgid "Ignore reverse zone"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
-msgid "Do not write reverse zone"
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
+msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:67
-msgid "Allow notify"
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
+msgid "OPSI"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
+msgid "Opsi admin"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
+msgid "Opsi password"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:60
+msgid "Opsi server"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:65
+msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Argonaut Fuse LTSP module settings"
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
-msgid "LTSP"
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
-msgid "LTSP server"
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+msgid "Argonaut DNS settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
+msgid "Argonaut Ldap2zone settings:"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:49
+msgid "Bind directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
+msgid "The directory in which conf file must be created"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:56
+msgid "Bind cache directory"
 msgstr ""
 
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:57
+msgid "The directory in which zone files must be created"
 msgstr ""
 
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
+msgid "Ignore reverse zone"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:33
-#: addons/argonaut/class_argonautImportFile.inc:36
-msgid "Argonaut task import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
+msgid "Do not write reverse zone"
 msgstr ""
-
-#: addons/argonaut/class_argonautImportFile.inc:34
-msgid "Imports argonaut tasks from CSV file"
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:67
+msgid "Allow notify"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:49
-msgid "Import actions from CSV file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid "Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages information"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid "Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be "
+"relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/es/fusiondirectory.po b/argonaut/locale/es/fusiondirectory.po
index 5848565744e16eb4a6c36426716e8d75bf05e050..5ff83011f09b84cc71abf3a902d25471c85976ab 100644
--- a/argonaut/locale/es/fusiondirectory.po
+++ b/argonaut/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 17:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/es_CO/fusiondirectory.po b/argonaut/locale/es_CO/fusiondirectory.po
index 9fa19e28db2ac5f888db3f539723f661c7e780a5..2191becc475d7f3e5d853a0b022b80d131f23028 100644
--- a/argonaut/locale/es_CO/fusiondirectory.po
+++ b/argonaut/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/es_VE/fusiondirectory.po b/argonaut/locale/es_VE/fusiondirectory.po
index 0900c9abe8a1a3d1eab6884dc64258ba2bd097c8..792244bb2e86764beb4cfb1dd152c607e225dc73 100644
--- a/argonaut/locale/es_VE/fusiondirectory.po
+++ b/argonaut/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,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:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/fa_IR/fusiondirectory.po b/argonaut/locale/fa_IR/fusiondirectory.po
index b3e4c570272afa51144e011d087f41130fa07a83..2dcb407a2276436548f463778a1323877b5c533a 100644
--- a/argonaut/locale/fa_IR/fusiondirectory.po
+++ b/argonaut/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/fi_FI/fusiondirectory.po b/argonaut/locale/fi_FI/fusiondirectory.po
index c22f4dfd4a80bf72f9bd3e6408f5da92dc5566a9..a5710a4bc11cb1ed86b94739dec2f7212ed148be 100644
--- a/argonaut/locale/fi_FI/fusiondirectory.po
+++ b/argonaut/locale/fi_FI/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:31+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/fr/fusiondirectory.po b/argonaut/locale/fr/fusiondirectory.po
index 22560539d96eb00f18ab6545b227da39b59f6187..dfa068d17b0e26745d0017ca2cc3363ce8f8a014 100644
--- a/argonaut/locale/fr/fusiondirectory.po
+++ b/argonaut/locale/fr/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Benoit Mortier <benoit.mortier@opensides.be>, 2016
 # MCMic, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:06+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,12 +27,12 @@ msgstr "Plusieurs serveurs Argonaut ont été trouvés. Un seul est supporté po
 msgid "There is no argonaut server configured"
 msgstr "Il n'y a pas de serveur Argonaut configuré"
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Impossible de lire \"%s\" !"
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" n'est pas un fichier !"
@@ -583,7 +584,7 @@ msgid ""
 msgstr "Activer ou non la suppression des tâches terminées avec succès par le serveur Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr "Obtenir des informations sur les paquets"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/hu_HU/fusiondirectory.po b/argonaut/locale/hu_HU/fusiondirectory.po
index a3b828d6d108ea2094e47f4e6557889420b574e7..876a2e4b6d8a9f15f27a656f612f680d404ce3f9 100644
--- a/argonaut/locale/hu_HU/fusiondirectory.po
+++ b/argonaut/locale/hu_HU/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:31+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/id/fusiondirectory.po b/argonaut/locale/id/fusiondirectory.po
index 633b7d767344abef41b3b8ea22ca61ae4a5e04f6..ce8c88cd38f699e765e279ac2c4fe77d65920f20 100644
--- a/argonaut/locale/id/fusiondirectory.po
+++ b/argonaut/locale/id/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:31+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/it_IT/fusiondirectory.po b/argonaut/locale/it_IT/fusiondirectory.po
index d1ef8fa63e177ef10fcaef6728a8f7b60e849111..1bf100da1c41945d980426be2fd6be8365caa9be 100644
--- a/argonaut/locale/it_IT/fusiondirectory.po
+++ b/argonaut/locale/it_IT/fusiondirectory.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Paola Penati <penati@avaya.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:23+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:22+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,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:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Impossibile analizzare \"%s\"!"
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" non é un file!"
@@ -582,7 +583,7 @@ msgid ""
 msgstr "Se é vero o meno che il server argonaut dovrebbe cancellare le tasks terminate con successo"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr "Ottenere pachetti d'informazioni"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/lv/fusiondirectory.po b/argonaut/locale/lv/fusiondirectory.po
index c8c041cc145b3017bf4c72675e10371b2e793a07..8acd5cf2c228d9bc622d490a39d684e406a8a62d 100644
--- a/argonaut/locale/lv/fusiondirectory.po
+++ b/argonaut/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/nb/fusiondirectory.po b/argonaut/locale/nb/fusiondirectory.po
index da76fd960bda24a9565a7e6e30142a3a6f770547..9ddc500b6a5cd959ada1268f767d6c71ca0b5155 100644
--- a/argonaut/locale/nb/fusiondirectory.po
+++ b/argonaut/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/nl/fusiondirectory.po b/argonaut/locale/nl/fusiondirectory.po
index 5ec8daa1e660147760830609e613bf960e1bf6e1..04aac9c60bf27ab949df722e20f55d1019c13dd2 100644
--- a/argonaut/locale/nl/fusiondirectory.po
+++ b/argonaut/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,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:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/pl/fusiondirectory.po b/argonaut/locale/pl/fusiondirectory.po
index 7518032a5dbe97657e90260cc966dff74029f067..3c52edec2e3f07bcc9bb07c1ad5b3ba067c30cec 100644
--- a/argonaut/locale/pl/fusiondirectory.po
+++ b/argonaut/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/pt/fusiondirectory.po b/argonaut/locale/pt/fusiondirectory.po
index de4365f3b3f185d75e77cf0ba747a59a0d7ff63c..9ad41b44d7c528a1e27c978100c5ad083a217b0c 100644
--- a/argonaut/locale/pt/fusiondirectory.po
+++ b/argonaut/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/pt_BR/fusiondirectory.po b/argonaut/locale/pt_BR/fusiondirectory.po
index 12388e40456d744cc07bfaa1aee8f8737db520c3..dcf32ced0751ba904b965711e7d1a4779eb7c051 100644
--- a/argonaut/locale/pt_BR/fusiondirectory.po
+++ b/argonaut/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,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:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr "O servidor Argonaut deve deletar ou não as tarefas finalizadas com sucesso."
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/ru/fusiondirectory.po b/argonaut/locale/ru/fusiondirectory.po
index 7e0efbc63625236643b89d9c37d1660394f41102..f11f19619ba0875c0a578fe7b93bc475b585c217 100644
--- a/argonaut/locale/ru/fusiondirectory.po
+++ b/argonaut/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-02-10 20:45+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/ru@petr1708/fusiondirectory.po b/argonaut/locale/ru@petr1708/fusiondirectory.po
index c410d079e95f85ceb693e77634f706739043a0a0..f102e4dbf88c4d00e586484fdaec251380eb8e40 100644
--- a/argonaut/locale/ru@petr1708/fusiondirectory.po
+++ b/argonaut/locale/ru@petr1708/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:31+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/sv/fusiondirectory.po b/argonaut/locale/sv/fusiondirectory.po
index 454ec58fc6334a03e287df237ed28e8152c0753d..e777de86010fc7acfac58df988607f1587f514e5 100644
--- a/argonaut/locale/sv/fusiondirectory.po
+++ b/argonaut/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/ug/fusiondirectory.po b/argonaut/locale/ug/fusiondirectory.po
index 47cf588a1e194daab8ec599a1d1646e45ebb8a4b..dbb1533f57cd31fbe55e18a4e1f9b63c7ffc5be4 100644
--- a/argonaut/locale/ug/fusiondirectory.po
+++ b/argonaut/locale/ug/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:31+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/vi_VN/fusiondirectory.po b/argonaut/locale/vi_VN/fusiondirectory.po
index 610e448c2acc452ca70628e8f653893404a79e67..7b6908c79139ab83713b70cf430a1d09c85cecf9 100644
--- a/argonaut/locale/vi_VN/fusiondirectory.po
+++ b/argonaut/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/argonaut/locale/zh/fusiondirectory.po b/argonaut/locale/zh/fusiondirectory.po
index 96a4b7dda242444a946ce71d7eac22485f88ebea..6d87eb2acd4bd3c3818b5ab0a037bb7f9680a72c 100644
--- a/argonaut/locale/zh/fusiondirectory.po
+++ b/argonaut/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
+#: include/class_supportDaemon.inc:602
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
+#: include/class_supportDaemon.inc:606
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -582,7 +582,7 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+msgid "Get packages information"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:56
diff --git a/audit/admin/audit/class_auditEvent.inc b/audit/admin/audit/class_auditEvent.inc
index 35819fa1f3046bf46de6a29b4c115b4001bd46d7..4b633ee362c057f52ab79ee8b964e1ce45a60fe3 100644
--- a/audit/admin/audit/class_auditEvent.inc
+++ b/audit/admin/audit/class_auditEvent.inc
@@ -60,7 +60,7 @@ class auditEvent extends simplePlugin
         'mainAttr'    => FALSE,
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/audit/config/audit/class_auditConfig.inc b/audit/config/audit/class_auditConfig.inc
index 051dc362977db37a65d3bb15c7b8d6d0f60d3e69..9ca0abf9e9b32432812717fbe768dd2887fb2cbd 100644
--- a/audit/config/audit/class_auditConfig.inc
+++ b/audit/config/audit/class_auditConfig.inc
@@ -30,7 +30,7 @@ class auditConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/audit/locale/ar/fusiondirectory.po b/audit/locale/ar/fusiondirectory.po
index ff9caa6b94767bff5bb9eeb5a95e9436320cfbaf..7eaa70ccfad3b617f54e6f6edc10bd5f7f9869de 100644
--- a/audit/locale/ar/fusiondirectory.po
+++ b/audit/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/audit/locale/ca/fusiondirectory.po b/audit/locale/ca/fusiondirectory.po
index 51105076de8cea8e8d0942df8e4debecd59ba750..3d75c4b4ec2a213e6daa8c38066530fc46bd20b6 100644
--- a/audit/locale/ca/fusiondirectory.po
+++ b/audit/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/audit/locale/cs_CZ/fusiondirectory.po b/audit/locale/cs_CZ/fusiondirectory.po
index dcb947d4f17c4f6a695e872c9bb43b3584af3e4e..51f6214b2f41c5cf369ade12acba6f8035c061f6 100644
--- a/audit/locale/cs_CZ/fusiondirectory.po
+++ b/audit/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/audit/locale/de/fusiondirectory.po b/audit/locale/de/fusiondirectory.po
index 57ab1f30a870e7d06f8f5f40aff8ead86540b4a4..f44a7d4502f564b091d56082c5a33b3d8d2175de 100644
--- a/audit/locale/de/fusiondirectory.po
+++ b/audit/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/audit/locale/el_GR/fusiondirectory.po b/audit/locale/el_GR/fusiondirectory.po
index 53cf9d7dc83a942eb5f3c2d9bbb6c91468eff860..e52084763df97dea5c6ca5af4e9700051458a84e 100644
--- a/audit/locale/el_GR/fusiondirectory.po
+++ b/audit/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/audit/locale/en/fusiondirectory.po b/audit/locale/en/fusiondirectory.po
index a1d203afeff4318a99417b376c60c29d61090a07..8e6d14a37b5a042e8116085a973923624fde8e73 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr ""
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/es/fusiondirectory.po b/audit/locale/es/fusiondirectory.po
index d6adbf8b6903a1738866338a717a28fad3a04771..6d38120606059e04d331721d88274ec57145cce2 100644
--- a/audit/locale/es/fusiondirectory.po
+++ b/audit/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/audit/locale/es_CO/fusiondirectory.po b/audit/locale/es_CO/fusiondirectory.po
index 65071851ccc04ca4e2e271e85eb48b7d7476cf98..3061c1d08009374ecca620945d742c337e798cad 100644
--- a/audit/locale/es_CO/fusiondirectory.po
+++ b/audit/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/audit/locale/es_VE/fusiondirectory.po b/audit/locale/es_VE/fusiondirectory.po
index 01613eb28a21bbb953a8a6c122f3fd6b58f52eb6..63b01f2e1d368f8577dc645eeae3ab56cf90eb9b 100644
--- a/audit/locale/es_VE/fusiondirectory.po
+++ b/audit/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/audit/locale/fa_IR/fusiondirectory.po b/audit/locale/fa_IR/fusiondirectory.po
index 4ad9939c16bbb518ecb2d4da0c47e88418416a3e..ac422ad4c52038b7f536db5c03a753685d1214c2 100644
--- a/audit/locale/fa_IR/fusiondirectory.po
+++ b/audit/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/audit/locale/fi_FI/fusiondirectory.po b/audit/locale/fi_FI/fusiondirectory.po
index 994cad6ca8d3f112629fd0e6ad7321973d9ca813..94f6279965836c24202fcad2c2d9548921fc398f 100644
--- a/audit/locale/fi_FI/fusiondirectory.po
+++ b/audit/locale/fi_FI/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-01 11:49+0000\n"
 "Last-Translator: Dina Solveig Jalkanen\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/audit/locale/fr/fusiondirectory.po b/audit/locale/fr/fusiondirectory.po
index 207ca079dce35bfc5d8fd7d22f344b3842029519..8a59955e9c329361922ec5bb351547e994f6a01c 100644
--- a/audit/locale/fr/fusiondirectory.po
+++ b/audit/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/audit/locale/hu_HU/fusiondirectory.po b/audit/locale/hu_HU/fusiondirectory.po
index bc93d51e173309d4b521239a8b363b65a1a1fe31..0c959fdea0edb695ccdf6aa1d6f6535625447e99 100644
--- a/audit/locale/hu_HU/fusiondirectory.po
+++ b/audit/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/audit/locale/id/fusiondirectory.po b/audit/locale/id/fusiondirectory.po
index 897afd9d3386e99776cd64da4412da2a6106626b..cb5c7758cf1fd12ac876774a4b2ead1e9106f2db 100644
--- a/audit/locale/id/fusiondirectory.po
+++ b/audit/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/audit/locale/it_IT/fusiondirectory.po b/audit/locale/it_IT/fusiondirectory.po
index 078873f8c5e8efebd4dfb09c033889fd92c274a7..ab6ca8810350c352148c05b44b23e85150341846 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:19+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/audit/locale/lv/fusiondirectory.po b/audit/locale/lv/fusiondirectory.po
index 1baf131c5716fa5a7eb6ea148f4c1b0478726114..1269f328aebda9f9ce695e9196c1d4ec6875dc73 100644
--- a/audit/locale/lv/fusiondirectory.po
+++ b/audit/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/audit/locale/nb/fusiondirectory.po b/audit/locale/nb/fusiondirectory.po
index 13a97be989f02bed8135b798f79496ab33d0f9f4..438cd771f78d9f1732acf2a6ec454e6ee66180de 100644
--- a/audit/locale/nb/fusiondirectory.po
+++ b/audit/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/audit/locale/nl/fusiondirectory.po b/audit/locale/nl/fusiondirectory.po
index c582de9cc67c0f5af81b8af168701107f9879ce7..a51dfaf5c22ced32be076a14ef93e58401e0dece 100644
--- a/audit/locale/nl/fusiondirectory.po
+++ b/audit/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/audit/locale/pl/fusiondirectory.po b/audit/locale/pl/fusiondirectory.po
index 56b81b771d5c7c324924ab310faf9a65aac98ac6..a0f03ea5ee1a884650879ffea9cc28a819dfe2ce 100644
--- a/audit/locale/pl/fusiondirectory.po
+++ b/audit/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/audit/locale/pt/fusiondirectory.po b/audit/locale/pt/fusiondirectory.po
index 4335a9de42c6a6ab0cdff7360fe79e44c7a1202d..dd73fb3d18af60d0b631972447955d23adb3a071 100644
--- a/audit/locale/pt/fusiondirectory.po
+++ b/audit/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/audit/locale/pt_BR/fusiondirectory.po b/audit/locale/pt_BR/fusiondirectory.po
index 2f86817a767422bdbf8de6014c374dcc519219c0..7c0ebd9a573022482e7df9bbe5de7f6507771625 100644
--- a/audit/locale/pt_BR/fusiondirectory.po
+++ b/audit/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/audit/locale/ru/fusiondirectory.po b/audit/locale/ru/fusiondirectory.po
index ae5599461e941a86977bc57fc803c930b8ae4445..2bbf87816698bd8e8f245b1a282266c59faa7606 100644
--- a/audit/locale/ru/fusiondirectory.po
+++ b/audit/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-12 06:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/audit/locale/ru@petr1708/fusiondirectory.po b/audit/locale/ru@petr1708/fusiondirectory.po
index e6f32cf624210c399bda292a3e1c47d57619bc05..860f7c4b8060ed8d08b24be3fc89f8fd7cbfbbe8 100644
--- a/audit/locale/ru@petr1708/fusiondirectory.po
+++ b/audit/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/audit/locale/sv/fusiondirectory.po b/audit/locale/sv/fusiondirectory.po
index e402bae24b7f452b103c37d7978108f0bc65b053..9949557ca25f4529e6358e9a44f70f2106769062 100644
--- a/audit/locale/sv/fusiondirectory.po
+++ b/audit/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/audit/locale/ug/fusiondirectory.po b/audit/locale/ug/fusiondirectory.po
index ca190b576e66b93193f8b880969778438682c103..757247313be4630ffa5b0f3d43ab54c62c1746e9 100644
--- a/audit/locale/ug/fusiondirectory.po
+++ b/audit/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/audit/locale/vi_VN/fusiondirectory.po b/audit/locale/vi_VN/fusiondirectory.po
index 573024c8d111187228b977c82cf28d4fc52e4969..f3915a80e52da0b0d243798ddc00c9d8420edb5d 100644
--- a/audit/locale/vi_VN/fusiondirectory.po
+++ b/audit/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/audit/locale/zh/fusiondirectory.po b/audit/locale/zh/fusiondirectory.po
index ac0223db47781c8794bf076271877152465af920..3c0931082403d927e428964abc2c024f717376b9 100644
--- a/audit/locale/zh/fusiondirectory.po
+++ b/audit/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/autofs/admin/autofs/class_autofsManagement.inc b/autofs/admin/autofs/class_autofsManagement.inc
index aa5cf4552d43f292f327b0d5462dd4c3018a0de9..0dede5350f1fe767c5a7141ca13409f1992d3776 100644
--- a/autofs/admin/autofs/class_autofsManagement.inc
+++ b/autofs/admin/autofs/class_autofsManagement.inc
@@ -24,7 +24,7 @@ class autofsManagement extends simpleManagement
 
   protected $autoFilterAttributes = array('dn', 'cn', 'description', 'nisMapName', 'nisMapEntry');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
diff --git a/autofs/admin/autofs/class_nisMap.inc b/autofs/admin/autofs/class_nisMap.inc
index cf6ee0791acbdfd568af392a67a4d4e15bbbbc42..9b7efd73ccdc6944b817e48c090a35212e1e7caf 100644
--- a/autofs/admin/autofs/class_nisMap.inc
+++ b/autofs/admin/autofs/class_nisMap.inc
@@ -24,7 +24,7 @@ class nisMap extends simplePlugin
 
   var $objectclasses  = array('nisMap', 'top');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -38,7 +38,7 @@ class nisMap extends simplePlugin
         'mainAttr'    => 'nisMapName',
       )),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/autofs/admin/autofs/class_nisObject.inc b/autofs/admin/autofs/class_nisObject.inc
index f14bce45ee3d3e4f1fb2b758fbd73e185b9a189b..4ec41f73b3a7781154e81d81fd5965e8009384be 100644
--- a/autofs/admin/autofs/class_nisObject.inc
+++ b/autofs/admin/autofs/class_nisObject.inc
@@ -24,7 +24,7 @@ class nisObject extends simplePlugin
 
   var $objectclasses  = array('nisObject');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -43,7 +43,7 @@ class nisObject extends simplePlugin
         ),
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/autofs/config/autofs/class_autofsConfig.inc b/autofs/config/autofs/class_autofsConfig.inc
index f25022fce4d4b5b6ee20a32ee6322db16a2165a8..f59de821ec7e5ead4f1e1b05453b8047edf62cf1 100644
--- a/autofs/config/autofs/class_autofsConfig.inc
+++ b/autofs/config/autofs/class_autofsConfig.inc
@@ -31,7 +31,7 @@ class autofsConfig extends simplePlugin
       "plCategory"      => array("configuration"),
       "plObjectType"    => array("smallConfig"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/autofs/locale/ar/fusiondirectory.po b/autofs/locale/ar/fusiondirectory.po
index a50f4dcf25fb23be8fc8a01c2f5ba3f9ea4f501e..14e77fbb83d3050c556bdf76d5cc13358dc5d47c 100644
--- a/autofs/locale/ar/fusiondirectory.po
+++ b/autofs/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -50,22 +50,22 @@ msgstr "الإسم"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/ca/fusiondirectory.po b/autofs/locale/ca/fusiondirectory.po
index a149406a03da1dc30dfe530d851c4885afbfd213..b5a79a8caa22da613e0a32330d079fed76f2a117 100644
--- a/autofs/locale/ca/fusiondirectory.po
+++ b/autofs/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -50,22 +50,22 @@ msgstr "Nom"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/cs_CZ/fusiondirectory.po b/autofs/locale/cs_CZ/fusiondirectory.po
index 8be36ae4b7fa118ceaee5c5ddd361dc16b91f4ca..a54a9d1d675de3a37c3f0baf422ecee280f9e986 100644
--- a/autofs/locale/cs_CZ/fusiondirectory.po
+++ b/autofs/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -50,22 +50,22 @@ msgstr "Název"
 msgid "Name of this directory"
 msgstr "Název tohoto adresáře"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr "Položka automatického připojení (automount)"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr "Položka této složky pro systémovou službu automount.\nNapříklad „auto.u“ nebo „-fstype=nfs nazevdomeny.tld:/pripojna/složka“"
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Přípojný bod"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr "Přípojný bod, do kterého bude tato složka umístěna"
 
diff --git a/autofs/locale/de/fusiondirectory.po b/autofs/locale/de/fusiondirectory.po
index 881e9b8b0b186cb1d978490a67341d2da97b5101..07d78734e42ff3270402a20baf00d2690ce88f0b 100644
--- a/autofs/locale/de/fusiondirectory.po
+++ b/autofs/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -51,22 +51,22 @@ msgstr "Name"
 msgid "Name of this directory"
 msgstr "Name dieses Verzeichnisses"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr "Automounteintrag"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr "Der Eintrag dieses Verzeichnisses für den automount Daemon.\nZum Beispiel 'auto.u' oder '-fstype=nfs domain.tld:/mount/directory'"
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Einhänge-Pfad"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr "Der Mountpoint dieses Verzeichnisses wird plaziert in"
 
diff --git a/autofs/locale/el_GR/fusiondirectory.po b/autofs/locale/el_GR/fusiondirectory.po
index bfa5fa0a5f86ffd0144f591534676ea8da750a7f..6e3665d3dad7806fe5d07d9de2d0d6c91226de6d 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -51,22 +51,22 @@ msgstr "Όνομα"
 msgid "Name of this directory"
 msgstr "Όνομα αυτού του κατάλογο"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr "Καταχώρηση αυτόματης προσάρτησης"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr "Η εγγραφή αυτού του καταλόγου για τον automount daemon.\n Για παράδειγμα 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Σημείο προσάρτησης"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr "Το σημείο προσάρτησης αυτού του καταλόγου θα τοποθετηθεί"
 
diff --git a/autofs/locale/en/fusiondirectory.po b/autofs/locale/en/fusiondirectory.po
index f28494246e3f7389d672c12a1bf77fe494ca52be..2fb8fbf79ba04d824c2f97894607ac92cf4b3354 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -30,33 +50,25 @@ msgstr ""
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/es/fusiondirectory.po b/autofs/locale/es/fusiondirectory.po
index feb165b36746d6ff0bb49deaa1f4c5b13a56d917..fada0d79e9eb84c8222c7bd22287e90b1a23e488 100644
--- a/autofs/locale/es/fusiondirectory.po
+++ b/autofs/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -50,22 +50,22 @@ msgstr "Nombre"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/es_CO/fusiondirectory.po b/autofs/locale/es_CO/fusiondirectory.po
index 34e8e4b4fb2d67bcbe62120cca5fa4ac3b286511..56e746f63ce5b6952ca64e6f29830a5f3c00510c 100644
--- a/autofs/locale/es_CO/fusiondirectory.po
+++ b/autofs/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -50,22 +50,22 @@ msgstr "Nombre"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/es_VE/fusiondirectory.po b/autofs/locale/es_VE/fusiondirectory.po
index 13b76c18469800a5da49ca342ea9bbe8752ff3fd..8b831d1dae87ed8b65a9724ab7990d8c43831d95 100644
--- a/autofs/locale/es_VE/fusiondirectory.po
+++ b/autofs/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -50,22 +50,22 @@ msgstr "Nombre"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/fa_IR/fusiondirectory.po b/autofs/locale/fa_IR/fusiondirectory.po
index c7631185a9e0aef17c3a302490d1124f867f9c9b..7e01227b3a28e93152618db8e709388fdd0caced 100644
--- a/autofs/locale/fa_IR/fusiondirectory.po
+++ b/autofs/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -50,22 +50,22 @@ msgstr ""
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/fi_FI/fusiondirectory.po b/autofs/locale/fi_FI/fusiondirectory.po
index ec0a925f5246651b07b093202f738b82aaae89b1..b564579532932c34e65eb14b3490740d2848519c 100644
--- a/autofs/locale/fi_FI/fusiondirectory.po
+++ b/autofs/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -50,22 +50,22 @@ msgstr "Nimi"
 msgid "Name of this directory"
 msgstr "Hakemiston nimi"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr "Automount"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/fr/fusiondirectory.po b/autofs/locale/fr/fusiondirectory.po
index a483e42376bc6b78a269db984b4434a10771f876..e8ca336b03ad8da5104cdf802c3f36e096983bb3 100644
--- a/autofs/locale/fr/fusiondirectory.po
+++ b/autofs/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -51,22 +51,22 @@ msgstr "Nom"
 msgid "Name of this directory"
 msgstr "Nom du répertoire"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr "Entrée automount"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 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.\nPar exemple «auto.u» ou «-fstype=nfs domaine.tld:/mount/répertoire»"
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Point de montage"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr "Le point de montage dans lequel ce répertoire sera mis"
 
diff --git a/autofs/locale/hu_HU/fusiondirectory.po b/autofs/locale/hu_HU/fusiondirectory.po
index 56c028970d835823fda597d028f68fdb2b237ef9..29f8bd399460791786cc4afd15783a2989fedd3b 100644
--- a/autofs/locale/hu_HU/fusiondirectory.po
+++ b/autofs/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -50,22 +50,22 @@ msgstr "Név"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/id/fusiondirectory.po b/autofs/locale/id/fusiondirectory.po
index 9ff2cc5e73ebd8d3bb801cc3d4e9de699e091068..64daa4f4a2aaadbe13ce8c4325286bcd8b07db28 100644
--- a/autofs/locale/id/fusiondirectory.po
+++ b/autofs/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -50,22 +50,22 @@ msgstr ""
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/it_IT/fusiondirectory.po b/autofs/locale/it_IT/fusiondirectory.po
index 84a61cfb9bc0a9cfa4185cdccb638ad80e193d25..49ad60bdeee873bad6f7358ec9050fe8540e19ff 100644
--- a/autofs/locale/it_IT/fusiondirectory.po
+++ b/autofs/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:20+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -52,22 +52,22 @@ msgstr "Nome"
 msgid "Name of this directory"
 msgstr "Nome di questa cartella"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr "Voce Automount"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr "Il nome di questa cartella per il demone automount.\n Ad esempio 'auto.u' oppure '-fstype=nfs domaine.tld:/mount/directory'"
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Punto di montaggio"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr "Il punto di montaggio in cui sarà posta questa cartella"
 
diff --git a/autofs/locale/lv/fusiondirectory.po b/autofs/locale/lv/fusiondirectory.po
index 84022fc600b05d9c4c48f4b9a877fb81fd77b5e8..908c92c4ba949bfdc2fa776ea7cb73e33b791f2d 100644
--- a/autofs/locale/lv/fusiondirectory.po
+++ b/autofs/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -50,22 +50,22 @@ msgstr "Vārds "
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/nb/fusiondirectory.po b/autofs/locale/nb/fusiondirectory.po
index 040fcb7cecea1f2ac19d62a67ed118d889c79628..fabb14f54ae11794464b60ddb385dc305b6d97c3 100644
--- a/autofs/locale/nb/fusiondirectory.po
+++ b/autofs/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -50,22 +50,22 @@ msgstr "Navn"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/nl/fusiondirectory.po b/autofs/locale/nl/fusiondirectory.po
index 332cb177490c88d1306c4635ae8465dfc2ce8f80..cbe1a7607005e260e59c6bc2f51d389e01df0729 100644
--- a/autofs/locale/nl/fusiondirectory.po
+++ b/autofs/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -50,22 +50,22 @@ msgstr "Naam"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Koppelpunt"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/pl/fusiondirectory.po b/autofs/locale/pl/fusiondirectory.po
index 8b3ce372b9372edeb1b258dc90525e88dd7e1610..362cb3c1c5c21aaa90f438dbd702b8fb31ebc932 100644
--- a/autofs/locale/pl/fusiondirectory.po
+++ b/autofs/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -50,22 +50,22 @@ msgstr "ImiÄ™"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Punkt montowania"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/pt/fusiondirectory.po b/autofs/locale/pt/fusiondirectory.po
index 1389c572ddf5e58b7539986c87246e6ae8cc7bc7..f2e990a95f289a5adcf2f8512f8f8b034cb2f503 100644
--- a/autofs/locale/pt/fusiondirectory.po
+++ b/autofs/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -50,22 +50,22 @@ msgstr "Nome"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/pt_BR/fusiondirectory.po b/autofs/locale/pt_BR/fusiondirectory.po
index dd04ad5a8e436cba0fd0feb3e9bb5ece23a1ccc2..712c6301700f9cccf5784880a9315d85cc4d4470 100644
--- a/autofs/locale/pt_BR/fusiondirectory.po
+++ b/autofs/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -50,22 +50,22 @@ msgstr "Nome"
 msgid "Name of this directory"
 msgstr "Nome deste diretório"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr "Entrada de automato"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr "A entrada deste diretório para o daemon de montagem automática.\nPara a instancia 'auto.u' ou '-fstype=nfs domaine.tld:/mount/directory'"
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Ponto de montagem"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr "O ponto de montagem deste diretório será em"
 
diff --git a/autofs/locale/ru/fusiondirectory.po b/autofs/locale/ru/fusiondirectory.po
index 6aa02d52781451ef3ec477083ddec1c1e4d9884c..738d2f2ebca46e1de17075ecd626a417ca879fb0 100644
--- a/autofs/locale/ru/fusiondirectory.po
+++ b/autofs/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -51,22 +51,22 @@ msgstr "Фамилия"
 msgid "Name of this directory"
 msgstr "Название каталога"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Точка монтирования"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/ru@petr1708/fusiondirectory.po b/autofs/locale/ru@petr1708/fusiondirectory.po
index b891f8cc17fb5cd1088837c72026ff8fe1c00816..6e3724a314327fa8c45e6fc948a67c124e6bb504 100644
--- a/autofs/locale/ru@petr1708/fusiondirectory.po
+++ b/autofs/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -50,22 +50,22 @@ msgstr ""
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/sv/fusiondirectory.po b/autofs/locale/sv/fusiondirectory.po
index 88d33e685f1482f16fa364d27c911043de38406b..dac5968b4b9d5fd27e8f3bacece629bc9a95c624 100644
--- a/autofs/locale/sv/fusiondirectory.po
+++ b/autofs/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -50,22 +50,22 @@ msgstr "Namn"
 msgid "Name of this directory"
 msgstr "Namn på katalog"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr "Automontera post"
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr "Posten för den här katalogen för automount-daemonen.\n Till exempel 'auto.u' eller '-fstype=nfs domain.tld:/mount/directory'"
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr "Monteringspunkt där katalogen kommer att placeras"
 
diff --git a/autofs/locale/ug/fusiondirectory.po b/autofs/locale/ug/fusiondirectory.po
index 43de0239f3a86723f7149d03dcbede5a02d13851..7b8b5106ba45a6491cdf3425d12169b7ed659953 100644
--- a/autofs/locale/ug/fusiondirectory.po
+++ b/autofs/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -50,22 +50,22 @@ msgstr ""
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/vi_VN/fusiondirectory.po b/autofs/locale/vi_VN/fusiondirectory.po
index b225ba39183c7629933e40972f57618d4e7100c7..9b607b6d0c37124053abeae23b0e10a4397aa026 100644
--- a/autofs/locale/vi_VN/fusiondirectory.po
+++ b/autofs/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -50,22 +50,22 @@ msgstr "Tên"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/autofs/locale/zh/fusiondirectory.po b/autofs/locale/zh/fusiondirectory.po
index 6d187db4cf102796b3ce683e662dffd76a988eab..49813433cf97cd2495a4cbcbfec176bb2e6e6b03 100644
--- a/autofs/locale/zh/fusiondirectory.po
+++ b/autofs/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -50,22 +50,22 @@ msgstr "名称"
 msgid "Name of this directory"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:62
+#: admin/autofs/class_nisObject.inc:64
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 msgstr ""
 
-#: admin/autofs/class_nisObject.inc:66 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
 msgstr "挂载点"
 
-#: admin/autofs/class_nisObject.inc:66
+#: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
diff --git a/certificates/locale/ar/fusiondirectory.po b/certificates/locale/ar/fusiondirectory.po
index a99e8effd655b82fa28c53a736eb37c83709f171..8f87e4c3da555d6a0f159d56c53b979654d1cddf 100644
--- a/certificates/locale/ar/fusiondirectory.po
+++ b/certificates/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/ca/fusiondirectory.po b/certificates/locale/ca/fusiondirectory.po
index f6f58b83664ce394fea6c59d16ef80e1111f204d..653f3b7caa457fe71f5f09a20c531579ba1956f7 100644
--- a/certificates/locale/ca/fusiondirectory.po
+++ b/certificates/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certificats"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Certificats de l'usuari"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/cs_CZ/fusiondirectory.po b/certificates/locale/cs_CZ/fusiondirectory.po
index 426a152273b8ffac2ed081b05e19be4ea2ae8748..bab18aefa1807a71786ea815489610297f8ebd13 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -23,19 +23,19 @@ msgstr ""
 msgid "Download"
 msgstr "Stáhnout si"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr "Neznámý formát"
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certifikáty"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "El. certifikáty uživatele"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr "Obsah certifikátu"
diff --git a/certificates/locale/de/fusiondirectory.po b/certificates/locale/de/fusiondirectory.po
index 1bfb6b2455fdc728b2da6e2d1eba47189c126488..20a678b82e75b4d39497b78c0fb451c2a92302fa 100644
--- a/certificates/locale/de/fusiondirectory.po
+++ b/certificates/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -23,19 +23,19 @@ msgstr ""
 msgid "Download"
 msgstr "Herunterladen"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr "Unbekanntes Format"
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Benutzer-Zertifikate"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr "Zertifikatsinhalt"
diff --git a/certificates/locale/el_GR/fusiondirectory.po b/certificates/locale/el_GR/fusiondirectory.po
index 5b3af9b8d4e45054d0a9f3629fcd651eb62fee1c..740a81db57137b95ece591b0085895901250dc25 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -23,19 +23,19 @@ msgstr ""
 msgid "Download"
 msgstr "Λήψη"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr "Άγνωστη μορφή"
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Πιστοποιητικά"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Πιστοποιητικά χρήστη"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr "Περιεχόμενο πιστοποιητικού"
diff --git a/certificates/locale/en/fusiondirectory.po b/certificates/locale/en/fusiondirectory.po
index 1f397f993601def4f4f7ef0a90180473be391ac9..e55406ef9c4375e14fd34e47279e6bd0c0cb30ca 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/es/fusiondirectory.po b/certificates/locale/es/fusiondirectory.po
index a011060626b17978a98f5239159867771c44b738..698d328185ebdd60db40dd16853fde524f36c1a3 100644
--- a/certificates/locale/es/fusiondirectory.po
+++ b/certificates/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr "Descargar"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certificados"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Certificados de usuario"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/es_CO/fusiondirectory.po b/certificates/locale/es_CO/fusiondirectory.po
index 40a661569eb9951ea8d3c1d12a4f58d1c9ee1d8d..bf0d3147185ec1dfa6c4d0384c8e421b25b1926a 100644
--- a/certificates/locale/es_CO/fusiondirectory.po
+++ b/certificates/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr "Descargar"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/es_VE/fusiondirectory.po b/certificates/locale/es_VE/fusiondirectory.po
index b853570b12d6041117f45dd1d6999026ef1dc289..705c5e69e1ae551832904e76842ee1690b350c46 100644
--- a/certificates/locale/es_VE/fusiondirectory.po
+++ b/certificates/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr "Descargar"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certificados"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Certificados de usuario"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/fa_IR/fusiondirectory.po b/certificates/locale/fa_IR/fusiondirectory.po
index 52b0e3add5909dbab40dce2d83695fc9d088010b..af32a88d3ea1820b853c8bfded00a4ef0b6c10b6 100644
--- a/certificates/locale/fa_IR/fusiondirectory.po
+++ b/certificates/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/fi_FI/fusiondirectory.po b/certificates/locale/fi_FI/fusiondirectory.po
index fa79e3bfca8eb585337d7dccf274a7b938beef73..8cdaefadd6d4391bad899ec052e8d278ccd5809c 100644
--- a/certificates/locale/fi_FI/fusiondirectory.po
+++ b/certificates/locale/fi_FI/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-01 11:36+0000\n"
 "Last-Translator: Dina Solveig Jalkanen\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -24,19 +24,19 @@ msgstr ""
 msgid "Download"
 msgstr "Lataa"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr "Tuntematon formatti"
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Sertifikaatit"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Käyttäjäsertifikaatit"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr "Sertifikaatin sisältö"
diff --git a/certificates/locale/fr/fusiondirectory.po b/certificates/locale/fr/fusiondirectory.po
index a7876b0bfa64cc32d12809b3d33ade55e338791d..7c3c732d14d67344e230344e59089782ea53ee4f 100644
--- a/certificates/locale/fr/fusiondirectory.po
+++ b/certificates/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -23,19 +23,19 @@ msgstr ""
 msgid "Download"
 msgstr "Télécharger"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr "Format inconnu"
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certificats"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Certificats utilisateurs"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr "Contenu du certificat"
diff --git a/certificates/locale/hu_HU/fusiondirectory.po b/certificates/locale/hu_HU/fusiondirectory.po
index ff7a7147c6a369cdae86ee37dab46ec830e5fe0d..8a126a7e0898beef0399bfca26d5ed0398a9c5e7 100644
--- a/certificates/locale/hu_HU/fusiondirectory.po
+++ b/certificates/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/id/fusiondirectory.po b/certificates/locale/id/fusiondirectory.po
index 0fbf05db843e9f61e4c5057866d31af111b256c7..a7aaa0301ba6510d64910ba9d888b2d6d219ca00 100644
--- a/certificates/locale/id/fusiondirectory.po
+++ b/certificates/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/it_IT/fusiondirectory.po b/certificates/locale/it_IT/fusiondirectory.po
index 25ab7e8fe06c5869d357852ae54c3d2ed5c79d30..a5b851ee19fcf8a39c9e4f6218f13a6a5a73f14c 100644
--- a/certificates/locale/it_IT/fusiondirectory.po
+++ b/certificates/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 14:38+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -24,19 +24,19 @@ msgstr ""
 msgid "Download"
 msgstr "Scarica"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr "Formato sconosciuto"
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certificati"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Certificati dell'utente"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr "Contenuto del certificato"
diff --git a/certificates/locale/lv/fusiondirectory.po b/certificates/locale/lv/fusiondirectory.po
index 2b1794ec71fc2b28a4b63cd418b0ffb0e059b162..828d79aad91e23436107385cd077f8a469f0a3d9 100644
--- a/certificates/locale/lv/fusiondirectory.po
+++ b/certificates/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/nb/fusiondirectory.po b/certificates/locale/nb/fusiondirectory.po
index 3bb6d9b9ac1720ab1b7072eb958097bc65e9359b..4fd59a562fde446f32f9025019b8f45fa9d048de 100644
--- a/certificates/locale/nb/fusiondirectory.po
+++ b/certificates/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/nl/fusiondirectory.po b/certificates/locale/nl/fusiondirectory.po
index 4bfcee8f699e13db41bdb6617aa1783da9d9f600..90d0db087725752abff09115b88458528e3d32d0 100644
--- a/certificates/locale/nl/fusiondirectory.po
+++ b/certificates/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr "Downloaden"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Gebruikerscertificaten"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/pl/fusiondirectory.po b/certificates/locale/pl/fusiondirectory.po
index 4b7408c26360358c0524835c9d30b01ebc9233c7..1518c63f446ca5c664c37af732048edf2206f202 100644
--- a/certificates/locale/pl/fusiondirectory.po
+++ b/certificates/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr "ÅšciÄ…gnij"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certyfikaty"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Certyfikaty użytkownika"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/pt/fusiondirectory.po b/certificates/locale/pt/fusiondirectory.po
index d0bb88281370e39099534cd0d7f54dbdab4b9b2f..faeb35183ba55808b763be11dcb4ea62ab2f8f37 100644
--- a/certificates/locale/pt/fusiondirectory.po
+++ b/certificates/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certificados"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/pt_BR/fusiondirectory.po b/certificates/locale/pt_BR/fusiondirectory.po
index adc053ace8471e9478573f8ff5f49756b5742adf..7eb2ef7c9894c67ff31464de17098071862fec74 100644
--- a/certificates/locale/pt_BR/fusiondirectory.po
+++ b/certificates/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/ru/fusiondirectory.po b/certificates/locale/ru/fusiondirectory.po
index bb504da6bbc5ccb9d6eb2bf7e8e79f33091e5205..130beba7ab9683b16deb265eab53b268a7bd5409 100644
--- a/certificates/locale/ru/fusiondirectory.po
+++ b/certificates/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-08 21:27+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -24,19 +24,19 @@ msgstr ""
 msgid "Download"
 msgstr "Скачать"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr "Неизвестный формат"
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Сертификаты"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr "Сертификаты пользователя"
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr "Содержимое сетрификата"
diff --git a/certificates/locale/ru@petr1708/fusiondirectory.po b/certificates/locale/ru@petr1708/fusiondirectory.po
index 544662d9fea8004d606e0c100d6fec20e3c4ae6c..f026765f61a33c7760a09b1afda60e02c2739d00 100644
--- a/certificates/locale/ru@petr1708/fusiondirectory.po
+++ b/certificates/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/sv/fusiondirectory.po b/certificates/locale/sv/fusiondirectory.po
index 624ba9326dce7180c8407897dcce620d5dea6fe9..04291a4c4a6230b32451c4330b72b4cbd51ba6b0 100644
--- a/certificates/locale/sv/fusiondirectory.po
+++ b/certificates/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr "Ladda ner"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Certifikat"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/ug/fusiondirectory.po b/certificates/locale/ug/fusiondirectory.po
index 5db25cfec5132c5e69c72c600f9904957134e21b..3c8867002d5162764f710f364430a3f9e43b3d06 100644
--- a/certificates/locale/ug/fusiondirectory.po
+++ b/certificates/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/vi_VN/fusiondirectory.po b/certificates/locale/vi_VN/fusiondirectory.po
index b43702f01bac47ea9684dad4e59838b8370856b8..ec789209c2316961bf4717dae865dbb3af4097a0 100644
--- a/certificates/locale/vi_VN/fusiondirectory.po
+++ b/certificates/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "Các giấy phép"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/locale/zh/fusiondirectory.po b/certificates/locale/zh/fusiondirectory.po
index 47344f58ab1335ddb9761fb098000205f7c4d1f7..64ccf63a6c440cabea498906ea7e42f07f6ddee2 100644
--- a/certificates/locale/zh/fusiondirectory.po
+++ b/certificates/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -22,19 +22,19 @@ msgstr ""
 msgid "Download"
 msgstr "下载"
 
-#: personal/certificates/class_userCertificates.inc:74
+#: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:116
-#: personal/certificates/class_userCertificates.inc:131
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
 msgid "Certificates"
 msgstr "证书"
 
-#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:118
 msgid "User certificates"
 msgstr ""
 
-#: personal/certificates/class_userCertificates.inc:135
+#: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
 msgstr ""
diff --git a/certificates/personal/certificates/class_userCertificates.inc b/certificates/personal/certificates/class_userCertificates.inc
index cb57840f56aa78049e61f41a859b47d7ee2ed678..f4cb8571fb016588a2709ec8da651623d0d908d5 100644
--- a/certificates/personal/certificates/class_userCertificates.inc
+++ b/certificates/personal/certificates/class_userCertificates.inc
@@ -23,7 +23,7 @@ class CertificateOrderedArrayAttribute extends OrderedArrayAttribute
   protected function genRowIcons($key, $value)
   {
     $id = $this->getHtmlId();
-    list ($img, $width) = parent::genRowIcons($key, $value);
+    list ($img, $nbicons) = parent::genRowIcons($key, $value);
     $img = $this->renderInputField(
       'image', $id.'_download_'.$key,
       array(
@@ -32,9 +32,10 @@ class CertificateOrderedArrayAttribute extends OrderedArrayAttribute
         'alt'   => _('Download'),
         'class' => 'center'
       )
-    ).'&nbsp;'.$img;
-    $width += 15;
-    return array ($img, $width);
+    ).$img;
+    $nbicons++;
+
+    return array ($img, $nbicons);
   }
 
   protected function handlePostValueActions($id, $postValue)
@@ -65,9 +66,9 @@ class CertificateFileAttribute extends FileAttribute
   function getArrayValue ()
   {
     $value = $this->getValue();
-    if (!strpos($value, self::$pemBegin)) {
+    if (!strpos($value, static::$pemBegin)) {
       /* Convert DER to PEM */
-      $value = self::$pemBegin."\n".chunk_split(base64_encode($value), 64, "\n").self::$pemEnd."\n";
+      $value = static::$pemBegin."\n".chunk_split(base64_encode($value), 64, "\n").static::$pemEnd."\n";
     }
     $infos = openssl_x509_parse($value, TRUE);
     if (empty($infos)) {
@@ -97,7 +98,7 @@ class CertificateFileAttribute extends FileAttribute
    */
   function setValue ($value)
   {
-    $pattern = '/'.preg_quote(self::$pemBegin, '/').'(.*)'.preg_quote(self::$pemEnd, '/').'/s';
+    $pattern = '/'.preg_quote(static::$pemBegin, '/').'(.*)'.preg_quote(static::$pemEnd, '/').'/s';
     if (preg_match($pattern, $value, $m)) {
       $value = base64_decode($m[1]);
     }
@@ -120,7 +121,7 @@ class userCertificates extends simplePlugin
       'plIcon'          => 'geticon.php?context=types&icon=certificate&size=48',
       'plSmallIcon'     => 'geticon.php?context=types&icon=certificate&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/community/admin/departments/community/class_communityOrganization.inc b/community/admin/departments/community/class_communityOrganization.inc
index 69334bcb760152b5a38ed6f82e45ed4b5f61ae22..b05d1f5a308f8877ab14dfd2574218fe8f051c0e 100644
--- a/community/admin/departments/community/class_communityOrganization.inc
+++ b/community/admin/departments/community/class_communityOrganization.inc
@@ -30,7 +30,7 @@ class communityOrganization extends simplePlugin
       'plDescription'   => _('Community organization dates and alternate address'),
       'plObjectType'    => array('organization'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/community/admin/departments/community/class_communityProject.inc b/community/admin/departments/community/class_communityProject.inc
index 25bd35cfc691075528cb3e09550f0bda1bdca873..6d00680be8700cfc6aab0900bcfde0ce34578373 100644
--- a/community/admin/departments/community/class_communityProject.inc
+++ b/community/admin/departments/community/class_communityProject.inc
@@ -30,7 +30,7 @@ class communityProject extends communityOrganization
       'plDescription'   => _('Community project dates and alternate address'),
       'plObjectType'    => array('department'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/community/config/community/class_communityConfig.inc b/community/config/community/class_communityConfig.inc
index 1ec6746dc23afb95107d0e3ac8149112b0e0a9b5..ab9b399b841aa4920aa8295a806411d0f87bde89 100644
--- a/community/config/community/class_communityConfig.inc
+++ b/community/config/community/class_communityConfig.inc
@@ -30,7 +30,7 @@ class communityConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/community/locale/ar/fusiondirectory.po b/community/locale/ar/fusiondirectory.po
index 17875b0bef80680d77d06075d29a2089e58c0d18..3693c8741f08baa5bea89415890313e323638dfd 100644
--- a/community/locale/ar/fusiondirectory.po
+++ b/community/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/community/locale/ca/fusiondirectory.po b/community/locale/ca/fusiondirectory.po
index 758e22d35b7c2a37acf349d8423399a083876099..56407e296e1d15cbdb7c3e5e70aa7fd2b8f14b9a 100644
--- a/community/locale/ca/fusiondirectory.po
+++ b/community/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/community/locale/cs_CZ/fusiondirectory.po b/community/locale/cs_CZ/fusiondirectory.po
index 9b68ba6501aa63100e6fee203f448cf36399da63..c9bf9321cdb0a19128c377c239aae2239efd8037 100644
--- a/community/locale/cs_CZ/fusiondirectory.po
+++ b/community/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/community/locale/de/fusiondirectory.po b/community/locale/de/fusiondirectory.po
index aed5086d4a8917bbeafd2f618a5d0dbcf3b821a7..edbbfc56f1a1a574f55e3652961a5c86b4798b3e 100644
--- a/community/locale/de/fusiondirectory.po
+++ b/community/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/community/locale/el_GR/fusiondirectory.po b/community/locale/el_GR/fusiondirectory.po
index dc0787913ab5cd3fd1f6b55795d6d35d6cccbb9c..b3734a82f3caa7b5a57ad9d5a00930ef6a80f362 100644
--- a/community/locale/el_GR/fusiondirectory.po
+++ b/community/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/community/locale/en/fusiondirectory.po b/community/locale/en/fusiondirectory.po
index c9a1fd36cfe1af8509ef23c41ad9ae34582a6018..66df223312ed6446971a1ed1fd60ec0c80845272 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr ""
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr ""
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/es/fusiondirectory.po b/community/locale/es/fusiondirectory.po
index 0e44a7c5e101b315adf7b8a858266e8a48095819..77cce63d7fa9265b77cad302e355ff3a0234b0c4 100644
--- a/community/locale/es/fusiondirectory.po
+++ b/community/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/community/locale/es_CO/fusiondirectory.po b/community/locale/es_CO/fusiondirectory.po
index 9c0dc5f48ef7c276eeae3c629233e5a92445b6c3..b2f7a0c075be84f8cbfed3ae61f5ae4950421f22 100644
--- a/community/locale/es_CO/fusiondirectory.po
+++ b/community/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/community/locale/es_VE/fusiondirectory.po b/community/locale/es_VE/fusiondirectory.po
index dad1da8833d46827e55ff559ed6d13ca0c151f87..58ec341baf81a657506e60d62d6604facff8a578 100644
--- a/community/locale/es_VE/fusiondirectory.po
+++ b/community/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/community/locale/fa_IR/fusiondirectory.po b/community/locale/fa_IR/fusiondirectory.po
index e54791c9dcae4fcffce000062afe3d7ea5a5ada9..f06b0b78018a6aba630e7f5da6e6305ba94ecc34 100644
--- a/community/locale/fa_IR/fusiondirectory.po
+++ b/community/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/community/locale/fi_FI/fusiondirectory.po b/community/locale/fi_FI/fusiondirectory.po
index 4fff7b612cdae7dadd7a9365917f61510d9d25ea..4dca032af89d3c822539a6135dbe0719e09957f5 100644
--- a/community/locale/fi_FI/fusiondirectory.po
+++ b/community/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-14 18:38+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/community/locale/fr/fusiondirectory.po b/community/locale/fr/fusiondirectory.po
index d6fd406d2da1f6bb1b3b70dd2c682d93a90bdbd7..c2993c582e2f9642e5126c6426c996b4d564f086 100644
--- a/community/locale/fr/fusiondirectory.po
+++ b/community/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:16+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/community/locale/hu_HU/fusiondirectory.po b/community/locale/hu_HU/fusiondirectory.po
index 4b7e03e77b389bd845c89192ce349a3ab76bc155..d9fe4e42a34f2ce42bb045d8a76aa69cb51d34d8 100644
--- a/community/locale/hu_HU/fusiondirectory.po
+++ b/community/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/community/locale/id/fusiondirectory.po b/community/locale/id/fusiondirectory.po
index bf2177af21cda3f6f412389672016d28e77bd4cb..c9c7c84968f91cc2d08696729ff08e16d8ee409b 100644
--- a/community/locale/id/fusiondirectory.po
+++ b/community/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/community/locale/it_IT/fusiondirectory.po b/community/locale/it_IT/fusiondirectory.po
index 78699be3c49be6b67af6d28bc0c475bd49479039..fd9de8f5a14e5f71208e5e9d1e514204ef1759fd 100644
--- a/community/locale/it_IT/fusiondirectory.po
+++ b/community/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:20+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/community/locale/lv/fusiondirectory.po b/community/locale/lv/fusiondirectory.po
index dad272fe3e65e035942463968d09f2f78ecf6ffd..de67b5df24b7e12ab444ce8ab9142e825265ffd3 100644
--- a/community/locale/lv/fusiondirectory.po
+++ b/community/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/community/locale/nb/fusiondirectory.po b/community/locale/nb/fusiondirectory.po
index f8a6d4d5acb0ad684b9232ce2ff22f5467cc0e89..eff60de128f5d9d40bb58345c66abd3eb56b075b 100644
--- a/community/locale/nb/fusiondirectory.po
+++ b/community/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/community/locale/nl/fusiondirectory.po b/community/locale/nl/fusiondirectory.po
index e2a16bd57110d206fd48453575646e709a8a75c6..81e4352cdb4db794edf1730a74247edbe239fee3 100644
--- a/community/locale/nl/fusiondirectory.po
+++ b/community/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/community/locale/pl/fusiondirectory.po b/community/locale/pl/fusiondirectory.po
index b26a86b1af65084dbd4ef2c7f96e8794607965a2..f1d446e1961fc216c9c079f371cf8d39bda22e88 100644
--- a/community/locale/pl/fusiondirectory.po
+++ b/community/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/community/locale/pt/fusiondirectory.po b/community/locale/pt/fusiondirectory.po
index 9d9c0ac3fae19e1d769577988cdf0471f1fc3a74..2714fde406375ef554c0eb40c8b872a15f289de2 100644
--- a/community/locale/pt/fusiondirectory.po
+++ b/community/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/community/locale/pt_BR/fusiondirectory.po b/community/locale/pt_BR/fusiondirectory.po
index f12485ba7f635a145f7b6a4043b033ec2e373ab5..e2446e95e8c39c5f9bc2de5120023047c6edb720 100644
--- a/community/locale/pt_BR/fusiondirectory.po
+++ b/community/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/community/locale/ru/fusiondirectory.po b/community/locale/ru/fusiondirectory.po
index 6b560339876d77b2da4a33c350f770c3d4fb7da9..4f36d3261c517ba6456122810a4b4730aeacdb63 100644
--- a/community/locale/ru/fusiondirectory.po
+++ b/community/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/community/locale/ru@petr1708/fusiondirectory.po b/community/locale/ru@petr1708/fusiondirectory.po
index d3b36d03f265bdd5560e1b008fb04ba2656aced9..b964ada7110939b79ee7d4a325597b2ead68b005 100644
--- a/community/locale/ru@petr1708/fusiondirectory.po
+++ b/community/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/community/locale/sv/fusiondirectory.po b/community/locale/sv/fusiondirectory.po
index e954f84ac671c89cf45aa2ace871f05d37065373..352b46f539f22199e15f24f212f11788bcbc9e8a 100644
--- a/community/locale/sv/fusiondirectory.po
+++ b/community/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/community/locale/ug/fusiondirectory.po b/community/locale/ug/fusiondirectory.po
index 4cf0c9763380481346c6d0eb32b5258601314118..a7ab674da36c622c6d1cc53407f40994f91e5487 100644
--- a/community/locale/ug/fusiondirectory.po
+++ b/community/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/community/locale/vi_VN/fusiondirectory.po b/community/locale/vi_VN/fusiondirectory.po
index ee2c89e162d20ad89ca59c742494691aa4b140b0..2e2733a1544a5b324fe157ac2b97918d1a5002a7 100644
--- a/community/locale/vi_VN/fusiondirectory.po
+++ b/community/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/community/locale/zh/fusiondirectory.po b/community/locale/zh/fusiondirectory.po
index 0edb50d439fce463f8e65a04bae30d300e051a90..3208f6a2da16110cb7d54534ee56079ed7e0f1bb 100644
--- a/community/locale/zh/fusiondirectory.po
+++ b/community/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/cyrus/admin/systems/services/cyrus/class_serviceCyrus.inc b/cyrus/admin/systems/services/cyrus/class_serviceCyrus.inc
index 36ed2e84d74e5905a66f8f70de2d3b186e8d0460..2b0165cd679a7bc399fbb3054a2fd64737d59af3 100644
--- a/cyrus/admin/systems/services/cyrus/class_serviceCyrus.inc
+++ b/cyrus/admin/systems/services/cyrus/class_serviceCyrus.inc
@@ -23,7 +23,7 @@ class serviceCyrus extends simpleService
 {
   var $objectclasses = array('fdCyrusServer');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -31,7 +31,7 @@ class serviceCyrus extends simpleService
       'plDescription'   => _('Cyrus (IMAP/POP3)').' ('._('Services').')',
       'plIcon'          => 'geticon.php?context=applications&icon=cyrus&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -112,12 +112,15 @@ class serviceCyrus extends simpleService
     );
   }
 
+  function save()
+  {
+    parent::save();
+  }
+
   protected function post_save()
   {
     parent::post_save();
-    if (!$this->initially_was_account) {
-      mailMethod::resetMailServersCache();
-    }
+    mailMethod::resetMailServersCache();
   }
 
   protected function post_remove ()
diff --git a/cyrus/locale/ar/fusiondirectory.po b/cyrus/locale/ar/fusiondirectory.po
index 2b32737b95cb130009e729ff9b9d0c1b685355a9..853cbad932fde0072106402ab30618c9b55c2b43 100644
--- a/cyrus/locale/ar/fusiondirectory.po
+++ b/cyrus/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/ca/fusiondirectory.po b/cyrus/locale/ca/fusiondirectory.po
index d623ced80c5441aabdaefe41eb197972b09d78f0..196b299c811fe54600cf14921d906e2cf9d608b8 100644
--- a/cyrus/locale/ca/fusiondirectory.po
+++ b/cyrus/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 bcaa49531f13dffad428550c3dd27e7a2b979535..e7ab67de3c9c6223464177cffa7c538c390ce9a2 100644
--- a/cyrus/locale/cs_CZ/fusiondirectory.po
+++ b/cyrus/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr "Položka v LDAPu byla odebrána, ale schránka (%s) na Cyru zůstala.\nSmažte ji prosím ručně!"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "Modul imap_getacl není implementován!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Nedaří se získat skript Sieve: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, 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:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 d565b4721adca53b7f8ee8375ed861cd724ff6f1..22718ea897d006f5b1096b45c09306f8485ccb15 100644
--- a/cyrus/locale/de/fusiondirectory.po
+++ b/cyrus/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -47,21 +47,21 @@ msgid ""
 msgstr "Der LDAP-Eintrag wurde entfernt, aber die Cyrus-Mailbox (%s) wurde nicht gelöscht. Bitte löschen Sie diesen Eintrag manuell!"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "Die Funktion imap_getacl ist nicht implementiert!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht beziehen: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht speichern: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 8ab5c82da21323bdc491a17fc61d5e5ec2019938..a9232bbcee61998abc7c27e146f7d3c202e30168 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -47,21 +47,21 @@ msgid ""
 msgstr "Η εγγραφή LDAP έχει απομακρυνθεί αλλά έχει διατηρηθεί το cyrus mailbox (%s) .\nΠαρακαλώ διαγράψτε χειρωνακτικά!"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "Το module imap_getacl  δεν έχει εφαρμοστεί!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Αδυναμία λήψης SIEVE script: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Αδυναμία αποθήκευσης SIEVE script: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 324b7c640e2642d7bd1c01a23ac815f87e2bb847..21b4be85d2d08bd76db946574d3506c07f848238 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/es/fusiondirectory.po b/cyrus/locale/es/fusiondirectory.po
index a2a3b6e30d7766612c2a5b36c1d392b3a3a4e6f6..d33badc4e302417b00b2983fcddc5ff2bd29d0ae 100644
--- a/cyrus/locale/es/fusiondirectory.po
+++ b/cyrus/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr "La entrada en LDAP ha sido eliminada, pero el buzón de correo cyrus (%s) existe.\n¡Por favor elimine el buzón manualmente!"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "¡No se ha implementado el módulo imap_getacl!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "No se puede acceder al script SIEVE: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, 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:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 64cb9dd28321c4dea568fda5586b3d95d8c407aa..78405257ada550a71ae4bb603591861830a6405d 100644
--- a/cyrus/locale/es_CO/fusiondirectory.po
+++ b/cyrus/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 95708ddb33ece2428ca7e80c96b68a72101404b9..f17447b0a673182860abd91878293f45a1b4a55f 100644
--- a/cyrus/locale/es_VE/fusiondirectory.po
+++ b/cyrus/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr "La entrada en LDAP ha sido eliminada, pero el buzón de correo cyrus (%s) existe.\n¡Por favor elimine el buzón manualmente!"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "¡No se ha implementado el módulo imap_getacl!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "No se puede acceder al script SIEVE: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, 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:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 771a0d65d83e8c3b2851356079e124221275e26b..1645d8e90c34d5fc2f5597defff747b46a725373 100644
--- a/cyrus/locale/fa_IR/fusiondirectory.po
+++ b/cyrus/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 78488cfad588494759336006b8284597b3043f28..c8d3ed06a3780239ffee314b61e2c5957578e87d 100644
--- a/cyrus/locale/fi_FI/fusiondirectory.po
+++ b/cyrus/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Ei pysty noutamaan SIEVE skriptia: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/fr/fusiondirectory.po b/cyrus/locale/fr/fusiondirectory.po
index c3037a551420bf5eca927a1037637444b43bebb3..56250c040c364a8490987146fb91ea205aeb84c8 100644
--- a/cyrus/locale/fr/fusiondirectory.po
+++ b/cyrus/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -47,21 +47,21 @@ msgid ""
 msgstr "L’entrée LDAP a été supprimée mais le compte de courriel (%s) est toujours présent dans Cyrus.\nVeuillez le supprimer manuellement !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "Le module imap_getacl n'est pas implémenté !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Impossible de récupérer le script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, 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:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Impossible d'activer le script SIEVE : %s"
diff --git a/cyrus/locale/hu_HU/fusiondirectory.po b/cyrus/locale/hu_HU/fusiondirectory.po
index 4583e630e60c26fcad8e5edd66b9e5f030c5a1d2..6ce0d75ca27c6abe80d9c5c40b0e9ab9bf7bcaa0 100644
--- a/cyrus/locale/hu_HU/fusiondirectory.po
+++ b/cyrus/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/id/fusiondirectory.po b/cyrus/locale/id/fusiondirectory.po
index fdf752e4f366cb3356da0b50306e2109207b2833..5f8a585991762fa31e304b81dd3268dfd7207cad 100644
--- a/cyrus/locale/id/fusiondirectory.po
+++ b/cyrus/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 50402c3bdbc428cf7fceee48827deb343bf4d8ee..537c94835474523f4ee997a57494f84a0284d7dd 100644
--- a/cyrus/locale/it_IT/fusiondirectory.po
+++ b/cyrus/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:20+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -48,21 +48,21 @@ msgid ""
 msgstr "L'entry LDAP è stata eliminata, ma la casella di posta elettronica (%s) è ancora presente in cyrus.\nElimina manualmente !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "Il modulo imap_getacl non è implementato !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Impossibile recuperare lo script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Impossibile memorizzare lo script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 f8de3be2e150236a6a8a1041d29c6df04af9c21f..72bc8107753431ed8c73bc68c3d7722fa149ef70 100644
--- a/cyrus/locale/lv/fusiondirectory.po
+++ b/cyrus/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/nb/fusiondirectory.po b/cyrus/locale/nb/fusiondirectory.po
index a5e0dd4bfe5cbfe7ea150b2b1ea2244261b807fe..5ac1fdd75410419f141d3fb70cb4d715527abe1a 100644
--- a/cyrus/locale/nb/fusiondirectory.po
+++ b/cyrus/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/nl/fusiondirectory.po b/cyrus/locale/nl/fusiondirectory.po
index 4a215c858ba87b5c55050becdcb8cf98699b455f..2c5507b9d1e25763d6d011c768757444855f5b32 100644
--- a/cyrus/locale/nl/fusiondirectory.po
+++ b/cyrus/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr "LDAP invoer is verwijderd, maar cyrus mailbox (%s) wordt gehouden.⏎ Gelieve deze handmatig te verwijderen!"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "De module imap_getacl is niet geïmplementeerd!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Kan SIEVE script niet vinden : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Kan SIEVE script niet opslaan : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 8a111f9aa48f93a41177a9603a86c4ef2b76d4a1..5cf4c363b774d431a3df0bd4b7e1fe8b40ca2e05 100644
--- a/cyrus/locale/pl/fusiondirectory.po
+++ b/cyrus/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/pt/fusiondirectory.po b/cyrus/locale/pt/fusiondirectory.po
index e0b1460c6058804b4177a83b56aeb37d3d4cbe92..1e912a769b39ad52e58bf26132ab549bcc1fc674 100644
--- a/cyrus/locale/pt/fusiondirectory.po
+++ b/cyrus/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 fa132b2d730d7cdd25c436aa9505bab47cbdfbbc..585ab7c73271a91ec9b13083642b2d3a970b4111 100644
--- a/cyrus/locale/pt_BR/fusiondirectory.po
+++ b/cyrus/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr "Entrada LDAP foi removida mas a caixa de correio cyrus (%s) foi mantida. Por favor, delete manualmente!"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr "O modulo imap_getacl não está implementado!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Não é possível recuperar script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, 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:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 4db51d7ff1d756f4a663b95f5967d254a12f2b3f..cb0cc6148a894d31c53e4088442cc319e204f1ca 100644
--- a/cyrus/locale/ru/fusiondirectory.po
+++ b/cyrus/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-24 12:43+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 05da4c4ed54d63146ff038f6687438721f4330dd..ce34b02b591126afeff5970d6fa46667bbc8cfa5 100644
--- a/cyrus/locale/ru@petr1708/fusiondirectory.po
+++ b/cyrus/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/sv/fusiondirectory.po b/cyrus/locale/sv/fusiondirectory.po
index 8872ef8ee33c2086a9f7e7a2b99abc1107e0ea6a..a1f46a6b3afad03a7d0fb66bde320c50381be2b0 100644
--- a/cyrus/locale/sv/fusiondirectory.po
+++ b/cyrus/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/ug/fusiondirectory.po b/cyrus/locale/ug/fusiondirectory.po
index 8600ec5aacab9ab41b47b39df9e70a62bb50043c..02dffd221eb5ba80705357e77fbab89920db6742 100644
--- a/cyrus/locale/ug/fusiondirectory.po
+++ b/cyrus/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 b6daac1a012770dec4823ca4af5313740ff8ea21..a5c00927a71f59c51279a197655dca0b465dace8 100644
--- a/cyrus/locale/vi_VN/fusiondirectory.po
+++ b/cyrus/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/zh/fusiondirectory.po b/cyrus/locale/zh/fusiondirectory.po
index 63888c7bf1870ed6c4d99dc71983370366239785..2aeef54c5709ef95497549f15c96c7237ba56f6f 100644
--- a/cyrus/locale/zh/fusiondirectory.po
+++ b/cyrus/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -46,21 +46,21 @@ msgid ""
 msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
 #, 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 72ff08c5848c5a0add03c86647a8677fe5baf094..fd83463528d8e6a838f7def70e887ce932c25f50 100644
--- a/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
+++ b/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
@@ -92,8 +92,8 @@ class mailMethodCyrus extends mailMethod
       @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Failed</b> :".imap_last_error(),
         "<b>IMAP:</b> ".$cfg['admin']."@".$cfg['connect']);
 
-      return FALSE;
       $this->connected = FALSE;
+      return FALSE;
     }
     @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>successful</b>",
         "<b>IMAP:</b> ".$cfg['admin']."@".$cfg['connect']);
diff --git a/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc b/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
index 7cdaba20877e3c71dedd0b651537ff2e3a83adab..e0e99a12e2a091e2b58ecdd3517e3e91c5bae0ae 100644
--- a/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
+++ b/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
@@ -172,7 +172,7 @@ class debconfProfileGeneric extends simplePlugin
         'icon'      => 'geticon.php?context=applications&icon=debconf&size=16',
         'mainAttr'  => 'ou',
       )),
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/debconf/admin/systems/debconf/class_debconfStartup.inc b/debconf/admin/systems/debconf/class_debconfStartup.inc
index 5eb471167b069a9ca4e46a13cb12623d7831cdce..afd6c633d29160fb46f23406010c4425a66c8dba 100644
--- a/debconf/admin/systems/debconf/class_debconfStartup.inc
+++ b/debconf/admin/systems/debconf/class_debconfStartup.inc
@@ -35,7 +35,7 @@ class debconfStartup extends simplePlugin
       'plPriority'      => 9,
       'plObjectType'    => array('workstation', 'server', 'ogroup-dynamic'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/debconf/locale/ar/fusiondirectory.po b/debconf/locale/ar/fusiondirectory.po
index 7229b233e6e005a840bbe8784f816d166a99c4bd..4196c587fc09399b8ed6bbf560c778e46518dd91 100644
--- a/debconf/locale/ar/fusiondirectory.po
+++ b/debconf/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,29 +17,29 @@ 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"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "خطأ"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/ca/fusiondirectory.po b/debconf/locale/ca/fusiondirectory.po
index eb605a906f1c3217a4130619c84bb4861186c326..5e3a520a4ae2b82534d55afad987779cce0c8969 100644
--- a/debconf/locale/ca/fusiondirectory.po
+++ b/debconf/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Error"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nom"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/cs_CZ/fusiondirectory.po b/debconf/locale/cs_CZ/fusiondirectory.po
index fd5402a5e3f83f3aba5b9581338754435db58bc7..3784b52803ee7ca98797afe34ae63f57d0760491 100644
--- a/debconf/locale/cs_CZ/fusiondirectory.po
+++ b/debconf/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Chyba"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr "Pro tento profil neexistuje Å¡ablona"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr "Pro sadu nastavení %s nebyla v LDAP nalezena položka %s"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Chyba LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr "Chyba v LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr "Debconf soubor importujete spuštěním následujícího příkazu: <br/><i>debconf2ldif.pl -b ou=<b>nazev</b>,%s -k <b>nazev_souboru</b> > sablona.ldif </i><br/>S názvem souboru <b>nazev_souboru</b> a požadovaným názvem šablony <b>nazev</b>.<br/>"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr "Debconf sada nastavení"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr "Údaje o sadě nastavení Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Název"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr "Importovat debconf soubor"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr "Název této debconf šablony"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr "Položky"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr "Odpovědi Debconf šablony"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Import"
 
diff --git a/debconf/locale/de/fusiondirectory.po b/debconf/locale/de/fusiondirectory.po
index a71b43bc3a32519674b4e0831c646fcb4fa77656..569f14d003230c6a9cf40a520c7a4d1305620256 100644
--- a/debconf/locale/de/fusiondirectory.po
+++ b/debconf/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,29 +18,29 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr "Es gibt keine Vorlage für dieses Profil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr "Kann Eintrag %s in LDAP für Profil %s nicht finden"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr "LDIF Fehler"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -49,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr "Um eine debconf-Datei zu importieren, führen Sie den folgenden Befehl aus : <br/><i>debconf2ldif.pl -b ou=<b>name</b>,%s -k <b>filename</b> > template.ldif </i><br/>Mit <b>filename</b> dem Dateinamen, und <b>name</b> dem gewünschten Namen für die Vorlage.<br/>"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr "Debconf Profil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr "Debconf-Profilinformation"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Name"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr "Importieren einer debconf Datei"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr "Name dieser debconf Vorlage"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr "Einträge"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr "Debconf Vorlage Antworten"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Importieren"
 
diff --git a/debconf/locale/el_GR/fusiondirectory.po b/debconf/locale/el_GR/fusiondirectory.po
index 51d1ddf5869551a17d6f05880cb5959b242ef229..4d1c8b7d301e28f85e68a08a291dcdc76097f421 100644
--- a/debconf/locale/el_GR/fusiondirectory.po
+++ b/debconf/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr "Δεν υπάρχει πρότυπο για αυτό το προφίλ"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr "Αδυναμία εύρεσης της καταχώρισης%s στο LDAP για το προφίλ %s"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "LDAP Λάθος"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr "Σφάλμα LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr "Για να εισάγεται ένα αρχείο debconf, παρακαλώ χρησιμοποιήστε την παρακάτω εντολή: br/><i>debconf2ldif.pl -b ou=<b>name</b>,%s -k <b>filename</b> > template.ldif </i><br/>Με <b>filename</b> το όνομα αρχείου, και <b>name</b> το επιθυμητό όνομα για το πρότυπο.<br/>"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr "Προφίλ Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr "Πληροφορίες προφίλ Debconf "
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr "Εισαγωγή ενός αρχείου debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr "Όνομα  για αυτό το πρότυπο debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr "Καταχωρήσεις"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr "Απαντήσεις προτύπου Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Εισαγωγή"
 
diff --git a/debconf/locale/en/fusiondirectory.po b/debconf/locale/en/fusiondirectory.po
index f6f840fbd50e3044005f140ab8c858bdd85661c9..201853b78efb0b9922e3ec1f75905bcbbe826860 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,38 +17,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/debconfProfile/class_debconfProfileManagement.inc:32
-#: admin/systems/debconf/class_debconfStartup.inc:33
-msgid "Debconf"
-msgstr ""
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr ""
-
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : <br/"
@@ -57,41 +48,50 @@ msgid ""
 "name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/es/fusiondirectory.po b/debconf/locale/es/fusiondirectory.po
index 07a75ffb1b4bfabc867ac5ffe5d5b41383beb558..5c94aefbcfc2b16442cdcdf3c559e9f2d1423ce0 100644
--- a/debconf/locale/es/fusiondirectory.po
+++ b/debconf/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Error"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Importar"
 
diff --git a/debconf/locale/es_CO/fusiondirectory.po b/debconf/locale/es_CO/fusiondirectory.po
index 0594368927974b7bd83fbd2b17055f4214e3f7cc..7d3b29e36164840279103fec9ecacf59143bffa4 100644
--- a/debconf/locale/es_CO/fusiondirectory.po
+++ b/debconf/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Error"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/es_VE/fusiondirectory.po b/debconf/locale/es_VE/fusiondirectory.po
index e5f185b153cf83c525be4a82f47e253175486318..d93a7f077b99393862e3e5c56bd9ae94eda0ebd1 100644
--- a/debconf/locale/es_VE/fusiondirectory.po
+++ b/debconf/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Error"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Importar"
 
diff --git a/debconf/locale/fa_IR/fusiondirectory.po b/debconf/locale/fa_IR/fusiondirectory.po
index 4fd33580e62317cbe92207fffa3b283ca1cf4020..76f00654a76e923456a0633ab6b109965f7c317f 100644
--- a/debconf/locale/fa_IR/fusiondirectory.po
+++ b/debconf/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "خطا"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/fi_FI/fusiondirectory.po b/debconf/locale/fi_FI/fusiondirectory.po
index a824e4f11344ec2245b3ca0bd3fd93519ad2ae4d..60e3876536ff471874fe730055abeed7839dce69 100644
--- a/debconf/locale/fi_FI/fusiondirectory.po
+++ b/debconf/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/fr/fusiondirectory.po b/debconf/locale/fr/fusiondirectory.po
index 1b60d108ead3181bad2bd679fd5f2dae5eec9402..85c5fc7f52b34d11b1b10e6447470109d88d29d8 100644
--- a/debconf/locale/fr/fusiondirectory.po
+++ b/debconf/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,29 +18,29 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr "Il n'y a pas de modèle pour ce profil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr "Impossible de trouver l'entrée %s dans le LDAP pour le profil %s"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr "Erreur LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -49,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr "Afin d'importer un fichier debconf, merci d’exécuter 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/>"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr "Profil Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr "Information du profil Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nom"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr "Importer un fichier Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr "Nom de ce profil Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr "Entrées"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr "Réponses du modèle Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Importer"
 
diff --git a/debconf/locale/hu_HU/fusiondirectory.po b/debconf/locale/hu_HU/fusiondirectory.po
index 6c62daed552e519729c57807632cf5114b4e0ed2..b06f893abeb08580e33dca14bb6e659d826af0a1 100644
--- a/debconf/locale/hu_HU/fusiondirectory.po
+++ b/debconf/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Név"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/id/fusiondirectory.po b/debconf/locale/id/fusiondirectory.po
index 6ba5b24687209f200c92e7874d9e3c6603fac2fd..76f351eb2acee2825fba2292b17c66142a806a7d 100644
--- a/debconf/locale/id/fusiondirectory.po
+++ b/debconf/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/it_IT/fusiondirectory.po b/debconf/locale/it_IT/fusiondirectory.po
index 8b94d6f7e556fc4e95e6d4da5047a36472da3102..79fdef24495d0b3e92580e1b1fd35b725e382264 100644
--- a/debconf/locale/it_IT/fusiondirectory.po
+++ b/debconf/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:21+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,29 +19,29 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Errore"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr "Non ci sono modelli per questo profilo"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr "Non trovo nessuna voce %s per il profilo LDAP %s"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr "Errore LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -50,38 +50,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr "Per importare un file debconf , eseguite i seguenti comandi : <br/><i>debconf2ldif.pl -b ou=<b>nome</b>,%s -k <b>nome-del-file</b> > template.ldif </i><br/>Con <b>nome-del-file</b> il nome del file, e <b>nome</b> il nome che si desidera dare al modello.<br/>"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr "Profilo debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr "Informazioni profilo debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr "Importare un file debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr "Nome di questo modello debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr "Voci"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr "Risposte al modello Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Importa"
 
diff --git a/debconf/locale/lv/fusiondirectory.po b/debconf/locale/lv/fusiondirectory.po
index 9d2a571614460723d2c63e6330d6e6be737a9a00..ac4b205c9f177d728aa49046556b36b68a4bea16 100644
--- a/debconf/locale/lv/fusiondirectory.po
+++ b/debconf/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Kļūda"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/nb/fusiondirectory.po b/debconf/locale/nb/fusiondirectory.po
index 48e4cd604505422aaa99f66f9890b65ed45b4c5d..96699956e237c0641ff2d6cbd3fffcf136b203d2 100644
--- a/debconf/locale/nb/fusiondirectory.po
+++ b/debconf/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Feil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Navn"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/nl/fusiondirectory.po b/debconf/locale/nl/fusiondirectory.po
index 2d91c8708bfdc7045d622b8aa73626aaacca9190..e07bfcf8289039bc0dd26491d12534b40ba08c4a 100644
--- a/debconf/locale/nl/fusiondirectory.po
+++ b/debconf/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Fout"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Naam"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Importeren"
 
diff --git a/debconf/locale/pl/fusiondirectory.po b/debconf/locale/pl/fusiondirectory.po
index 636ad2d866d4242bb65a86565291b6376311f6ee..228e03ba580172bc6424fd303065f0350269bc2c 100644
--- a/debconf/locale/pl/fusiondirectory.po
+++ b/debconf/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Import"
 
diff --git a/debconf/locale/pt/fusiondirectory.po b/debconf/locale/pt/fusiondirectory.po
index 38cee0a0c96bbb87e4c7a7470235690a8658fc40..7702b44fbb59e7c3e95de28de42d06db431c4f35 100644
--- a/debconf/locale/pt/fusiondirectory.po
+++ b/debconf/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Erro"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/pt_BR/fusiondirectory.po b/debconf/locale/pt_BR/fusiondirectory.po
index b5d42c8df90635de96ba60716741aa7d3a37161b..ddd1917bf68edf27767f39b08828f7868480c463 100644
--- a/debconf/locale/pt_BR/fusiondirectory.po
+++ b/debconf/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Erro"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr "Não existe nenhum modelo para este perfil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr "Não foi encontrado a entrada %s em LDAP para o perfil %s"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr "Erro LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr "INa ordem para importar um arquivo debconf, por favor rode os seguintes comandos : <br/><i>debconf2ldif.pl -b ou=<b>name</b>,%s -k <b>filename</b> > template.ldif </i><br/>With <b>filename</b> the file name, and <b>name</b> the desired name for the template.<br/>"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr "Perfil Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr "Importar arquivo debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr "Nome deste modelo debconf "
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr "Entradas"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr "Modelo de respostas Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Importar"
 
diff --git a/debconf/locale/ru/fusiondirectory.po b/debconf/locale/ru/fusiondirectory.po
index 1ab33558f7af24316fc0958fe8456a86d0aecbea..e93f240c00b94eb4619ffc3386d81ee0bc38d4ff 100644
--- a/debconf/locale/ru/fusiondirectory.po
+++ b/debconf/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,29 +17,29 @@ 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"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Ошибка"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "Импортировать"
 
diff --git a/debconf/locale/ru@petr1708/fusiondirectory.po b/debconf/locale/ru@petr1708/fusiondirectory.po
index eb1ca2a26f353eb6a4eca7b6aadccf7114443392..23fc375eb20727349e311f4977c66442d082208d 100644
--- a/debconf/locale/ru@petr1708/fusiondirectory.po
+++ b/debconf/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,29 +17,29 @@ 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"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/sv/fusiondirectory.po b/debconf/locale/sv/fusiondirectory.po
index d95e0b2cfb74e44435fa4f26f9e8701dc6216e83..039dfb78835f7ce70ff3442ff7ace6943872250c 100644
--- a/debconf/locale/sv/fusiondirectory.po
+++ b/debconf/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Fel"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Namn"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/ug/fusiondirectory.po b/debconf/locale/ug/fusiondirectory.po
index fbe09b334d71f88e4687e844bbe2b8065d461754..4e56405b8bdbeafd1b17558db3497c153f11beb1 100644
--- a/debconf/locale/ug/fusiondirectory.po
+++ b/debconf/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/vi_VN/fusiondirectory.po b/debconf/locale/vi_VN/fusiondirectory.po
index b30bd3039a2ba7f86919621480be11fc7fb926d3..06c99b1d194106c2043c2e4360cb6a111b038baf 100644
--- a/debconf/locale/vi_VN/fusiondirectory.po
+++ b/debconf/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Tên"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/zh/fusiondirectory.po b/debconf/locale/zh/fusiondirectory.po
index 86a9a5bc5b3a94c03f41b537c6f3fbe75482bf63..bc8dbc15df0b6523bf33c2901bba2e3e754825ff 100644
--- a/debconf/locale/zh/fusiondirectory.po
+++ b/debconf/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
 msgid "Error"
 msgstr "错误"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:72
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:87
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:140
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:150
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +48,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:170
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:167
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:185
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "名称"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:192
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:209
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
 msgid "Import"
 msgstr "导入"
 
diff --git a/developers/debug-help/addons/debug-help/class_debugHelp.inc b/developers/debug-help/addons/debug-help/class_debugHelp.inc
index 198f08f49aaa464787687e1e162eb21ab71fbf57..fefb0fac63441c6cf60cda666d7ef4ed5ddfdc08 100644
--- a/developers/debug-help/addons/debug-help/class_debugHelp.inc
+++ b/developers/debug-help/addons/debug-help/class_debugHelp.inc
@@ -33,7 +33,7 @@ class debugHelp extends simplePlugin
         'mainAttr'  => FALSE
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/developers/locale/ar/fusiondirectory.po b/developers/locale/ar/fusiondirectory.po
index 855edc4ff70b3a3978127a2c20635938837f6064..09f4c5656710ae79f21aaf02520b759f788bc9ee 100644
--- a/developers/locale/ar/fusiondirectory.po
+++ b/developers/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/ca/fusiondirectory.po b/developers/locale/ca/fusiondirectory.po
index 6b3cc41bd035c212b8b3f7a3d574ac64b6a593eb..9e0ce40e1bb8ae8d9c26f6b5951480811ad9df5a 100644
--- a/developers/locale/ca/fusiondirectory.po
+++ b/developers/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/cs_CZ/fusiondirectory.po b/developers/locale/cs_CZ/fusiondirectory.po
index 2645546d2876c94c08464bbdd86400461dbd2ca1..25cb7b56b58fc33a9b5fe96b86a26c3079386272 100644
--- a/developers/locale/cs_CZ/fusiondirectory.po
+++ b/developers/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -58,12 +58,12 @@ msgid "Does the bicycle have a bell"
 msgstr "Má jízdní kolo zvonek?"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
-msgstr "Údaje FTP"
+msgid "FTP information"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
-msgstr "Údaje pro přihlašování ke službě FTP"
+msgid "Information for ftp login"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login"
diff --git a/developers/locale/de/fusiondirectory.po b/developers/locale/de/fusiondirectory.po
index e06efb4e1f5e54ee082d37259dff308bce0a28fc..18dfdef5af69f8dedc87eb01d52587fbeb698cf3 100644
--- a/developers/locale/de/fusiondirectory.po
+++ b/developers/locale/de/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -59,12 +59,12 @@ msgid "Does the bicycle have a bell"
 msgstr "Hat das Fahrrad eine Klingel"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
-msgstr "FTP Informationen"
+msgid "FTP information"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
-msgstr "Informationen für FTP-Login"
+msgid "Information for ftp login"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login"
diff --git a/developers/locale/el_GR/fusiondirectory.po b/developers/locale/el_GR/fusiondirectory.po
index 0ca7edd2351fa78fb176394e7ffa6303983e3c15..54e1c2391784185070ed958816f96ff1c02fcfd1 100644
--- a/developers/locale/el_GR/fusiondirectory.po
+++ b/developers/locale/el_GR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -59,12 +59,12 @@ msgid "Does the bicycle have a bell"
 msgstr "Εχει το ποδήλατο κουδούνι"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
-msgstr "Πληροφορίες FTP "
+msgid "FTP information"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
-msgstr "Πληροφορίες για την σύνδεση ftp "
+msgid "Information for ftp login"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login"
diff --git a/developers/locale/en/fusiondirectory.po b/developers/locale/en/fusiondirectory.po
index 9cca47cbe3699313d49974917f2f48ee22028d69..be00fe5c91325f49ec29950e474f247a1b5b6bde 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,31 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-#: debug-help/addons/debug-help/class_debugHelp.inc:32
-msgid "Debug help"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:27
-msgid "Debug help tools"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:44
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:48
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:50
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:55
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -83,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
@@ -130,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/es/fusiondirectory.po b/developers/locale/es/fusiondirectory.po
index a576d5ff881faf049fb535a334cf76600802051e..cc7c821a5ee3c9a3111f1d6b2cb8c21f485fcfd2 100644
--- a/developers/locale/es/fusiondirectory.po
+++ b/developers/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/es_CO/fusiondirectory.po b/developers/locale/es_CO/fusiondirectory.po
index 630c798fd05fb9b0ded12c8562a79bf380cd7571..9c5fb4f1f6ad56dee89ec5aeeea6f4a64d4e6c75 100644
--- a/developers/locale/es_CO/fusiondirectory.po
+++ b/developers/locale/es_CO/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -59,11 +59,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/es_VE/fusiondirectory.po b/developers/locale/es_VE/fusiondirectory.po
index 012ef48891487741ab300fba806aa98a8ca46e37..822a8dd12dc9dd8497724664a81d8c66b9edec63 100644
--- a/developers/locale/es_VE/fusiondirectory.po
+++ b/developers/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/fa_IR/fusiondirectory.po b/developers/locale/fa_IR/fusiondirectory.po
index 3eb03da259b81cf6c6c1f0ed37395e290f4909b8..57e2b402ec0cfcf474a69cdad38d88aad5fa9738 100644
--- a/developers/locale/fa_IR/fusiondirectory.po
+++ b/developers/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/fi_FI/fusiondirectory.po b/developers/locale/fi_FI/fusiondirectory.po
index f65562f8f6ed41ff51eeca2bd6cdd1ab7c274cb0..92275daa12c9c0b8e2f156b845c934be4f79e572 100644
--- a/developers/locale/fi_FI/fusiondirectory.po
+++ b/developers/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/fr/fusiondirectory.po b/developers/locale/fr/fusiondirectory.po
index 0bf4d9d93e8a93bcabcf2cc87a74ca3901067c72..120ae7bc3f7ed1034748c192b34ca8d6ab4b3cb0 100644
--- a/developers/locale/fr/fusiondirectory.po
+++ b/developers/locale/fr/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Benoit Mortier <benoit.mortier@opensides.be>, 2016
 # MCMic, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:02+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,11 +60,11 @@ msgid "Does the bicycle have a bell"
 msgstr "Est-ce que la bicyclette à une sonnette"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr "Informations FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr "Informations pour la session FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/hu_HU/fusiondirectory.po b/developers/locale/hu_HU/fusiondirectory.po
index 00a00402879ec15fbb1972a1debe22fb56fa105e..bcb1b12ed6560620056cfbc5ee13b99b0d18829c 100644
--- a/developers/locale/hu_HU/fusiondirectory.po
+++ b/developers/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/id/fusiondirectory.po b/developers/locale/id/fusiondirectory.po
index d4f9b3419fc045be6f40c887a5bf820a6ae49108..4ce4452b709f843b11a8ac3079e56ab67b35e5ee 100644
--- a/developers/locale/id/fusiondirectory.po
+++ b/developers/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/it_IT/fusiondirectory.po b/developers/locale/it_IT/fusiondirectory.po
index 89fc4d18dfbd02042f6c003f0533ac529daff0d3..798c61ae5a93021c02dd2ff748a67c535ca8720c 100644
--- a/developers/locale/it_IT/fusiondirectory.po
+++ b/developers/locale/it_IT/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Paola Penati <penati@avaya.com>, 2015
+# Paola Penati <penati@avaya.com>, 2015-2016
 # Paola Penati <penati@avaya.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:17+0000\n"
+"Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,11 +60,11 @@ msgid "Does the bicycle have a bell"
 msgstr "La bici ha una campana"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr "Informazioni FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr "Informazioni per l'accesso ftp"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/lv/fusiondirectory.po b/developers/locale/lv/fusiondirectory.po
index 579dfea28409c563c5935f593e0c0f252f08eda8..0f7722d49c57f1371ebc58c5157750ec69ea5884 100644
--- a/developers/locale/lv/fusiondirectory.po
+++ b/developers/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/nb/fusiondirectory.po b/developers/locale/nb/fusiondirectory.po
index bcf9d6a3c3f6b27834b1c048210907bc07d3ec21..5eef2141d301c84172b58a18f490a4de53186cdf 100644
--- a/developers/locale/nb/fusiondirectory.po
+++ b/developers/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/nl/fusiondirectory.po b/developers/locale/nl/fusiondirectory.po
index b44f05f795805a3517c9d9f8238405ca861ecfaf..7b644975bcf5648ae7f90f581fa78f77ed5f4704 100644
--- a/developers/locale/nl/fusiondirectory.po
+++ b/developers/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/pl/fusiondirectory.po b/developers/locale/pl/fusiondirectory.po
index 810f84d1ffed78154849db7ab0fba2a9696f2bdc..99a1edfe1d07c534e075df590bdd91c42b191831 100644
--- a/developers/locale/pl/fusiondirectory.po
+++ b/developers/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/pt/fusiondirectory.po b/developers/locale/pt/fusiondirectory.po
index d6830c46fbc0173164da531485a18fcc841d468c..0deb183855eb4330577a0c3c5751d2ed563b1377 100644
--- a/developers/locale/pt/fusiondirectory.po
+++ b/developers/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/pt_BR/fusiondirectory.po b/developers/locale/pt_BR/fusiondirectory.po
index 8aacd3eaa298da4357c192914ebc4bc5c1dd7a95..04e0c1390f89c0017f4ba1cbe017edc8afc5ba1e 100644
--- a/developers/locale/pt_BR/fusiondirectory.po
+++ b/developers/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -58,12 +58,12 @@ msgid "Does the bicycle have a bell"
 msgstr "A bicicleta possui campainha?"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
-msgstr "Informações de FTP"
+msgid "FTP information"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
-msgstr "Informações para login de FTP"
+msgid "Information for ftp login"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login"
diff --git a/developers/locale/ru/fusiondirectory.po b/developers/locale/ru/fusiondirectory.po
index 5492c88ad54bdc24435cdf405aa5736c22ce33d0..868eab90b7008c6ad16959b9e47feed557339884 100644
--- a/developers/locale/ru/fusiondirectory.po
+++ b/developers/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/ru@petr1708/fusiondirectory.po b/developers/locale/ru@petr1708/fusiondirectory.po
index c3fc32ff5207e9f5acb8c70e2265edfc3c810a7d..87167d409fc21c6fbdc5d5db572a6a3a2aa71dea 100644
--- a/developers/locale/ru@petr1708/fusiondirectory.po
+++ b/developers/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/sv/fusiondirectory.po b/developers/locale/sv/fusiondirectory.po
index 18abd4d0765e8e464f6fd818fd84deed7211d815..b34aea70bd5283dc52f8c32ae9c2a76db4a9ea1d 100644
--- a/developers/locale/sv/fusiondirectory.po
+++ b/developers/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -58,12 +58,12 @@ msgid "Does the bicycle have a bell"
 msgstr "Har cykeln ringklocka"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
-msgstr "FTP-information"
+msgid "FTP information"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
-msgstr "Information för ftp-inloggning"
+msgid "Information for ftp login"
+msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login"
diff --git a/developers/locale/ug/fusiondirectory.po b/developers/locale/ug/fusiondirectory.po
index e6bb2f1e0abb780acf86cd143c3b9dc304323a64..6bc14203beb06988169379620416f1d2daa13062 100644
--- a/developers/locale/ug/fusiondirectory.po
+++ b/developers/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/vi_VN/fusiondirectory.po b/developers/locale/vi_VN/fusiondirectory.po
index b71040e8a3bbf219f609b2e711187080371d8ac1..ecbb933c82bf23ea7c334109bbf21fe25ea47292 100644
--- a/developers/locale/vi_VN/fusiondirectory.po
+++ b/developers/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/locale/zh/fusiondirectory.po b/developers/locale/zh/fusiondirectory.po
index 30b95efb79495e73cea5d083794fd816b2ae8f28..669bef689ab838d2d3f464b333ff455f96b3757a 100644
--- a/developers/locale/zh/fusiondirectory.po
+++ b/developers/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
-msgid "FTP informations"
+msgid "FTP information"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
-msgid "Informations for ftp login"
+msgid "Information for ftp login"
 msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
diff --git a/developers/simple-plugin/demoPlugin/class_demoPlugin.inc b/developers/simple-plugin/demoPlugin/class_demoPlugin.inc
index c0d18061d4b633b6b12856fd83c7b1eae8bda84f..ddc6e5309e0da5b771240468f6212042ec5b00cf 100644
--- a/developers/simple-plugin/demoPlugin/class_demoPlugin.inc
+++ b/developers/simple-plugin/demoPlugin/class_demoPlugin.inc
@@ -81,10 +81,10 @@ class demoPlugin extends simplePlugin
         )
       ),
       'ftp' => array(
-        'name'  => _('FTP informations'),
+        'name'  => _('FTP information'),
         'attrs' => array(
           new CompositeAttribute (
-            _('Informations for ftp login'),
+            _('Information for ftp login'),
             'ftpLoginInfo',
             array(
               new StringAttribute (_('Login'),    _('Login for FTP'),     'ftpLogin'),
@@ -110,7 +110,7 @@ class demoPlugin extends simplePlugin
       'plObjectType'      => array('user'),
 
       // But simplePlugin can generate the ACL list for us
-      'plProvidedAcls'    => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'    => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 }
diff --git a/developers/simple-plugin/demoPlugin/demoplugin.schema b/developers/simple-plugin/demoPlugin/demoplugin.schema
index 9a9e4ba243e5cc7574030a3f5d80d5b33cc89d64..5651f97c0bb89541b815ea3e2f52b7ea82689154 100644
--- a/developers/simple-plugin/demoPlugin/demoplugin.schema
+++ b/developers/simple-plugin/demoPlugin/demoplugin.schema
@@ -27,7 +27,7 @@ attributetype ( 1.3.6.1.4.1.38414.1337.11.2 NAME 'bicycleBell'
   SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.4.1.38414.1337.12.1 NAME 'ftpLoginInfo'
-  DESC 'Fusion Directory - Demo plugin, FTP login informations.'
+  DESC 'Fusion Directory - Demo plugin, FTP login information.'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index b4bf2b321e1cb4440d343a1f9b7859a396f9b507..e02a834f421e10e0cee2bc98e9a542c820612902 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -96,11 +96,11 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
   protected function genRowIcons($key, $value)
   {
     $id = $this->getHtmlId();
-    list ($img, $width) = parent::genRowIcons($key, $value);
+    list ($img, $nbicons) = parent::genRowIcons($key, $value);
 
     if ($key == 0) {
       /* Remove delete button on first row */
-      $img = preg_replace('/<input[^>]+>&nbsp;$/', '', $img);
+      $img = preg_replace('/<input[^>]+>$/', '', $img);
     }
 
     $img = $this->renderInputField(
@@ -112,9 +112,9 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
         'class' => 'center',
       )
     ).$img;
-    $width += 20;
+    $nbicons++;
 
-    return array ($img, $width);
+    return array ($img, $nbicons);
   }
 
   protected function handlePostValueActions($id, $postValue)
@@ -199,7 +199,6 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
       'cn'              => array($cn),
       'dhcpHWAddress'   => array('ethernet '.$mac),
       'dhcpStatements'  => array(
-        'host-name '.$cn,
         'fixed-address '.$ip
       ),
       'dhcpOption'      => array(),
diff --git a/dhcp/admin/dhcp/sections/class_dhcpHost.inc b/dhcp/admin/dhcp/sections/class_dhcpHost.inc
index 60783abbc685426120e58625edf5cb7fe1dbd3f9..a995ae0663e3beeabd7354700c7a0beefdb04424 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpHost.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpHost.inc
@@ -52,7 +52,6 @@ class dhcpHost extends dhcpPlugin
     $attributesInfo['host']['attrs'][0]->setLinearRendering(TRUE);
     $attributesInfo['main']['attrs'][2]->setDefaultValue(
       array(
-        'host-name cn',
         'fixed-address ip',
       )
     );
diff --git a/dhcp/locale/ar/fusiondirectory.po b/dhcp/locale/ar/fusiondirectory.po
index e81e8b7eefd3a43dc1e55e4717396d21aa19ee3d..392feef136077dff3f0eef3b4b04f62fbc50835b 100644
--- a/dhcp/locale/ar/fusiondirectory.po
+++ b/dhcp/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -18,9 +18,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:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "خطأ"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "مجموعة"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/ca/fusiondirectory.po b/dhcp/locale/ca/fusiondirectory.po
index 7ee349f75c9752035272e3e22f8b26fa1ebc49af..2b52f9d72d4f1d02343c22dd1cccece018b70133 100644
--- a/dhcp/locale/ca/fusiondirectory.po
+++ b/dhcp/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/cs_CZ/fusiondirectory.po b/dhcp/locale/cs_CZ/fusiondirectory.po
index 832b41b7cec513a95a41908c548e2eba802cf5e7..26f58c4d188a2050cbbfc76fb81acd3d9ca0eebf 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/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:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr "Nastavení DHCP"
 
@@ -78,7 +78,7 @@ msgstr "Sbalit"
 msgid "Insert new DHCP section"
 msgstr "Vložit novou DHCP sekci"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -86,74 +86,74 @@ msgstr "Vložit novou DHCP sekci"
 msgid "Name"
 msgstr "Název"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Celkové předvolby"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Chyba"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "Nastavení DHCP jsou neznámá. Kontaktujte svého správce systémů."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr "DHCP sekce, obsluhovaná tímto serverem"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Protokolování"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Třída"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Podtřída"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Počítač"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "skupina"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "rozsah"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Podsíť"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr "Protějšek, který převezme služby v případě selhání"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Sdílená síť"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "klíč pro aktualizaci DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "zóny aktualizace DNS"
 
diff --git a/dhcp/locale/de/fusiondirectory.po b/dhcp/locale/de/fusiondirectory.po
index 678156f5c4cc584f1e2af4bc01b2734956774362..0634aa8c546e67143aa292b96eae9e40bbdecafb 100644
--- a/dhcp/locale/de/fusiondirectory.po
+++ b/dhcp/locale/de/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -20,9 +20,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr "DHCP-Konfiguration"
 
@@ -79,7 +79,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr "Füge neue DHCP-Sektion ein"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -87,74 +87,74 @@ msgstr "Füge neue DHCP-Sektion ein"
 msgid "Name"
 msgstr "Name"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Globale Optionen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren System-Administrator."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Protokollierung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "System"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Vorrat"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnetz"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr "Host für Ausfallsicherung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Verteiltes Netzwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "DNS-Update-Schlüssel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "DNS-Update-Zonen"
 
diff --git a/dhcp/locale/el_GR/fusiondirectory.po b/dhcp/locale/el_GR/fusiondirectory.po
index a2dafcd71da7f0ad013102acb1485c520b5490da..6379057744f459fbebc78541474a9b182159d933 100644
--- a/dhcp/locale/el_GR/fusiondirectory.po
+++ b/dhcp/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -20,9 +20,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr "Ρύθμιση DHCP"
 
@@ -79,7 +79,7 @@ msgstr "Fold"
 msgid "Insert new DHCP section"
 msgstr "Εισαγωγή νέας ενότητας DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -87,74 +87,74 @@ msgstr "Εισαγωγή νέας ενότητας DHCP"
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Καθολικές επιλογές"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr "Τα τμήματα του DHCP που διαχειρίζεται αυτός ο διακομιστής."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Καταγραφή"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Class"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Subclass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Όνομα συστήματος"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Ομάδα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Ομάδα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Υποδίκτυο"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Κοινόχρηστο  δίκτυο"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "Κλειδί ενημέρωσης DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "Ζώνες ενημέρωσης DNS"
 
diff --git a/dhcp/locale/en/fusiondirectory.po b/dhcp/locale/en/fusiondirectory.po
index 97b16e9aee028a120823a823f7fc69b4807477b3..1e8eb3916b0036839437d91d0a232a455fabcc48 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: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/es/fusiondirectory.po b/dhcp/locale/es/fusiondirectory.po
index 6bc913b994880e76b0c91fbe9ad414dbef357045..48b339dbd7610839021d5adb82e85eefcbcb6d60 100644
--- a/dhcp/locale/es/fusiondirectory.po
+++ b/dhcp/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr "Configuración DHCP"
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Insertar nueva sección DHCP"
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "La configuración DHCP es desconocida. Contacte con su administrador de sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
diff --git a/dhcp/locale/es_CO/fusiondirectory.po b/dhcp/locale/es_CO/fusiondirectory.po
index f319504a8df08aa769f3177742d1ab4a03b662ad..2b215eabc11038a98a177ff48769504f705efe3d 100644
--- a/dhcp/locale/es_CO/fusiondirectory.po
+++ b/dhcp/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "GRupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/es_VE/fusiondirectory.po b/dhcp/locale/es_VE/fusiondirectory.po
index 3c4c4e64235d561a7ac44701ec8c7022ee674b63..30fccd922b08dc01abd8aff081447ed11ec70653 100644
--- a/dhcp/locale/es_VE/fusiondirectory.po
+++ b/dhcp/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr "Configuración DHCP"
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Insertar nueva sección DHCP"
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "La configuración DHCP es desconocida. Contacte con su administrador de sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
diff --git a/dhcp/locale/fa_IR/fusiondirectory.po b/dhcp/locale/fa_IR/fusiondirectory.po
index 44c889f9663f5c640fa9b91c0158effa6f85b891..b1bcdeed6e99e8465236c07053b6a8950e11294c 100644
--- a/dhcp/locale/fa_IR/fusiondirectory.po
+++ b/dhcp/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "خطا"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/fi_FI/fusiondirectory.po b/dhcp/locale/fi_FI/fusiondirectory.po
index 1c8708018adff006ac30f5608ae99b35e1852432..66c4d20d08c70811fbeab0a6958e728173c4b69c 100644
--- a/dhcp/locale/fi_FI/fusiondirectory.po
+++ b/dhcp/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/fr/fusiondirectory.po b/dhcp/locale/fr/fusiondirectory.po
index aaff372fdd04f1eb35c22af31bf6245145d101c8..4b72ea0e8993859dd33ab9beea6206fa929d4979 100644
--- a/dhcp/locale/fr/fusiondirectory.po
+++ b/dhcp/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:57+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -20,9 +20,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr "Configuration DHCP"
 
@@ -79,7 +79,7 @@ msgstr "Replier"
 msgid "Insert new DHCP section"
 msgstr "Insérer une nouvelle section DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -87,74 +87,74 @@ msgstr "Insérer une nouvelle section DHCP"
 msgid "Name"
 msgstr "Nom"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Options globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "La configuration DHCP est inconnue. Veuillez contacter votre administrateur système."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr "Objets dhcp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr "Les sections DHCP gérées par ce serveur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Journaux systèmes"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Sous classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Hôte"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Groupe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Réservoir"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Sous réseau"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr "Pair de reprise sur panne"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Réseau partagé"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "Clef de mise à jour du DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "Zones DNS à mettre à jour"
 
diff --git a/dhcp/locale/hu_HU/fusiondirectory.po b/dhcp/locale/hu_HU/fusiondirectory.po
index 9401cb5b2b700b76f75c88e41b59ce31a66f4033..704b172ae80ba445eefda2c5809e6f03acfd7e33 100644
--- a/dhcp/locale/hu_HU/fusiondirectory.po
+++ b/dhcp/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Név"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/id/fusiondirectory.po b/dhcp/locale/id/fusiondirectory.po
index 2737e901dcea2d2d73a6574ed7b75e95d6bc838d..31ccd36dfb065969ba52c9d7932a72e6eb993930 100644
--- a/dhcp/locale/id/fusiondirectory.po
+++ b/dhcp/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/it_IT/fusiondirectory.po b/dhcp/locale/it_IT/fusiondirectory.po
index cff56fc6a04e802530cbea5ecc89173c45962b82..22fcfcec7ca87707e001aec12f3af30bcf062e38 100644
--- a/dhcp/locale/it_IT/fusiondirectory.po
+++ b/dhcp/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 15:44+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -20,9 +20,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr "Configurazione del DHCP"
 
@@ -79,7 +79,7 @@ msgstr "Piega"
 msgid "Insert new DHCP section"
 msgstr "Inserisci una nuova sezione DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -87,74 +87,74 @@ msgstr "Inserisci una nuova sezione DHCP"
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Opzioni globali"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Errore"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "La configurazione DHCP impostata è sconosciuta. Contatta l'amministratore del sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr "Oggetti DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr "Sezioni DHCP gestite da questo server"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Giornale di sistema"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Categoria"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Sottoclasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Deposito"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Sottorete"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr "Partner per la presa di controllo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Rete condivisa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "Stile di aggiornamento dinamico del DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "Aggiornamento delle zone DNS"
 
diff --git a/dhcp/locale/lv/fusiondirectory.po b/dhcp/locale/lv/fusiondirectory.po
index 5ccf5959777baa131a53a26441ab34c0fbaf973f..d3c6a0f40ef529537a57cc04638ccd1d997afac3 100644
--- a/dhcp/locale/lv/fusiondirectory.po
+++ b/dhcp/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -18,9 +18,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:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Kļūda"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/nb/fusiondirectory.po b/dhcp/locale/nb/fusiondirectory.po
index 6752c58c8907b43c1da1ffc3559ca005cdcab4b1..17988e7191951496090394b00267c66723826e10 100644
--- a/dhcp/locale/nb/fusiondirectory.po
+++ b/dhcp/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Feil"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Vert"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/nl/fusiondirectory.po b/dhcp/locale/nl/fusiondirectory.po
index c9d44b307e3fba0a08eddba0de8279d3463de84c..de56eb45a5017d54f66d312cd3b97a56d4ff3d78 100644
--- a/dhcp/locale/nl/fusiondirectory.po
+++ b/dhcp/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr "DHCP configuratie"
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr "Voer nieuwe DHCP sectie in"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Voer nieuwe DHCP sectie in"
 msgid "Name"
 msgstr "Naam"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Globale opties"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Fout"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "De ingestelde DHCP configuratie is onbekend. Neem contact op met uw systeembeheerder."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Loggen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Groep"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnet"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Gedeeld netwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "DNS update sleutel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "DNS update zones"
 
diff --git a/dhcp/locale/pl/fusiondirectory.po b/dhcp/locale/pl/fusiondirectory.po
index 10928512c0581d42a5f62ca10b73a60c469beb78..80195463dd5509d3a52ed37214beb1ba733a47ed 100644
--- a/dhcp/locale/pl/fusiondirectory.po
+++ b/dhcp/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Klasa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/pt/fusiondirectory.po b/dhcp/locale/pt/fusiondirectory.po
index 0ebcdc7285f6326db5aea6ae467927b6fe3e82a8..34e82d2bf3e7067ac15f590882e40320a4977b27 100644
--- a/dhcp/locale/pt/fusiondirectory.po
+++ b/dhcp/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/pt_BR/fusiondirectory.po b/dhcp/locale/pt_BR/fusiondirectory.po
index 4f7565bc7c5df12c274c1979988c607e2a1b25aa..689d12a89b810f2f582c3bc59a974bba8a056886 100644
--- a/dhcp/locale/pt_BR/fusiondirectory.po
+++ b/dhcp/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr "Inserir nova seção DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Inserir nova seção DHCP"
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "A configuração de DHCP é desconhecida. Por favor, contacte seu administrador do sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Logando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/ru/fusiondirectory.po b/dhcp/locale/ru/fusiondirectory.po
index eb75cde12e8632356926d4eb338f30abffa22681..0cb877e314e7c2bd76db140fbacf442c9578c76c 100644
--- a/dhcp/locale/ru/fusiondirectory.po
+++ b/dhcp/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/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:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -78,7 +78,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -86,74 +86,74 @@ msgstr ""
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Ошибка"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Хост"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Группа"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/ru@petr1708/fusiondirectory.po b/dhcp/locale/ru@petr1708/fusiondirectory.po
index d313baf7053ace94eb490834b8dd23b6e809dc67..b088dc66d25bf4dee1587b35a06ea09f7414ee77 100644
--- a/dhcp/locale/ru@petr1708/fusiondirectory.po
+++ b/dhcp/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\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:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/sv/fusiondirectory.po b/dhcp/locale/sv/fusiondirectory.po
index 182216e1d0c3ef989e67ed7afacfbfd137803b85..3b9188086c59e7dd9604b3cbf55579d673af98d7 100644
--- a/dhcp/locale/sv/fusiondirectory.po
+++ b/dhcp/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr "Infoga ny DHCP-sektion"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Infoga ny DHCP-sektion"
 msgid "Name"
 msgstr "Namn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr "Globala inställningar"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Fel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "DHCP-konfigurationen är okänd. Kontakta systemadministratören"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr "Loggning"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "Klass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr "Subklass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Grupp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnät"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr "Delat nätverk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr "DNS-uppdateringsnyckel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr "DNS-uppdateringszoner"
 
diff --git a/dhcp/locale/ug/fusiondirectory.po b/dhcp/locale/ug/fusiondirectory.po
index 997760b66fb2e40aaa595a14fe7d87abf38289e7..3cdb33d5e21acfeb31c08f161fff4f7d3c67f49d 100644
--- a/dhcp/locale/ug/fusiondirectory.po
+++ b/dhcp/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/vi_VN/fusiondirectory.po b/dhcp/locale/vi_VN/fusiondirectory.po
index c2fc425105a4cf9f2290c92c8be020a985cc84be..d7635954f0082904a427851beb9c439749b8d02e 100644
--- a/dhcp/locale/vi_VN/fusiondirectory.po
+++ b/dhcp/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Tên"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "Nhóm "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dhcp/locale/zh/fusiondirectory.po b/dhcp/locale/zh/fusiondirectory.po
index 2724a32cd73a9306f109ea6348a70bae3989e6c6..0eafc9f6cf00ae23907b35aeedbe1db6f4982f73 100644
--- a/dhcp/locale/zh/fusiondirectory.po
+++ b/dhcp/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:477
 #: admin/dhcp/class_dhcpConfiguration.inc:478
-#: admin/dhcp/class_dhcpConfiguration.inc:479
-#: admin/dhcp/class_dhcpConfiguration.inc:481
+#: admin/dhcp/class_dhcpConfiguration.inc:480
 msgid "DHCP configuration"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/class_dhcpConfiguration.inc:245
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "名称"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:366
-#: admin/dhcp/class_dhcpConfiguration.inc:407
-#: admin/dhcp/class_dhcpConfiguration.inc:517
+#: admin/dhcp/class_dhcpConfiguration.inc:365
+#: admin/dhcp/class_dhcpConfiguration.inc:406
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid "Error"
 msgstr "错误"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:422
+#: admin/dhcp/class_dhcpConfiguration.inc:421
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:495
+#: admin/dhcp/class_dhcpConfiguration.inc:494
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:516
+#: admin/dhcp/class_dhcpConfiguration.inc:515
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:518
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Class"
 msgstr "ç±»"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:519
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 msgid "Group"
 msgstr "组"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:522
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update zones"
 msgstr ""
 
diff --git a/dns/admin/dns/class_DnsRecordAttribute.inc b/dns/admin/dns/class_DnsRecordAttribute.inc
index d111e9c17b87f77b9f5b9e0b3ba2409d92c24070..d354b1d8af411f11628b749d5805e86c5697e197 100644
--- a/dns/admin/dns/class_DnsRecordAttribute.inc
+++ b/dns/admin/dns/class_DnsRecordAttribute.inc
@@ -127,7 +127,7 @@ class DnsRecordAttribute extends CompositeAttribute
   function __construct($label, $description, $ldapName, $required, $acl = '')
   {
     $attributes = array(
-      new SelectAttribute(_('Type'), '', $ldapName.'_type', $required, array_keys(self::$types), '', array_values(self::$types)),
+      new SelectAttribute(_('Type'), '', $ldapName.'_type', $required, array_keys(static::$types), '', array_values(static::$types)),
       new HiddenAttribute($ldapName.'_nofield'),
       new SelectAttribute(
         _('Reverse zone'), _('Reverse zone this record should be in, if any'),
@@ -366,7 +366,7 @@ class DnsRecordAttribute extends CompositeAttribute
           $this->attributes[1] = new StringAttribute(_('Content'), _('Content of this record'), $ldapName, TRUE);
         break;
       }
-      if (in_array($type, self::$reverseTypes)) {
+      if (in_array($type, static::$reverseTypes)) {
         $this->attributes[2]->setVisible(TRUE);
       } else {
         $this->attributes[2]->setVisible(FALSE);
@@ -408,7 +408,7 @@ class DnsRecordAttribute extends CompositeAttribute
       return $error;
     }
     $type = $this->attributes[0]->getValue();
-    if (in_array($type, self::$reverseTypes) && ($this->attributes[2]->getValue() != '')) {
+    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);
diff --git a/dns/admin/dns/class_dnsAcl.inc b/dns/admin/dns/class_dnsAcl.inc
index 82171c340dd955c3c37f05e0df4df154d24f84c4..22a9703e18d1bfa68d83074500aa85dab0bcec73 100644
--- a/dns/admin/dns/class_dnsAcl.inc
+++ b/dns/admin/dns/class_dnsAcl.inc
@@ -36,7 +36,7 @@ class dnsAcl extends simplePlugin
         'icon'        => 'geticon.php?context=categories&icon=acl&size=16'
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/dns/admin/dns/class_dnsManagement.inc b/dns/admin/dns/class_dnsManagement.inc
index 8fd0e26f31c300f4eb651913d501fd9088b5fac2..ca24b6ea49001e7901a38ffc393a81762eddf562 100644
--- a/dns/admin/dns/class_dnsManagement.inc
+++ b/dns/admin/dns/class_dnsManagement.inc
@@ -26,7 +26,7 @@ class dnsManagement extends simpleManagement
   protected $departmentRootVisible  = TRUE;
   protected $baseMode               = TRUE;
 
-  protected $autoFilterAttributes = array('dn', 'cn', 'description', 'relativeDomainName');
+  protected $autoFilterAttributes = array('dn', 'cn', 'description', 'zoneName', 'relativeDomainName', 'sOARecord');
 
   static function plInfo()
   {
@@ -44,8 +44,81 @@ class dnsManagement extends simpleManagement
 
   function __construct()
   {
-    //~ $this->listXMLPath    = get_template_path('dns-list.xml', TRUE, dirname(__FILE__));
     parent::__construct();
   }
+
+  function configureHeadpage ()
+  {
+    parent::configureHeadpage();
+    if (class_available('supportDaemon')) {
+      $this->registerAction('zonerefresh', 'ldap2zoneRefresh');
+      array_splice(
+        $this->headpage->xmlData['actionmenu']['action'],
+        2,
+        0,
+        array(
+          array(
+            'name'  => 'zonerefresh',
+            'type'  => 'entry',
+            'image' => 'geticon.php?context=actions&icon=view-refresh&size=16',
+            'label' => 'Refresh Zone',
+            'acl'   => 'dnsZone/dnsZone[w]',
+          )
+        )
+      );
+      array_splice(
+        $this->headpage->xmlData['actiontriggers']['action'],
+        2,
+        0,
+        array(
+          array(
+            'name'  => 'zonerefresh',
+            'type'  => 'entry',
+            'image' => 'geticon.php?context=actions&icon=view-refresh&size=16',
+            'label' => 'Refresh Zone',
+            'acl'   => '%acl[w]',
+          )
+        )
+      );
+    }
+  }
+
+  function ldap2zoneRefresh ($action, $targets)
+  {
+    if (empty($targets)) {
+      return;
+    }
+    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).'))');
+      if (count($servers) > 1) {
+        msg_dialog::display(_('Could not run ldap2zone'), _('More than one server matches the SOA'), ERROR_DIALOG);
+      } elseif (count($servers) == 0) {
+        msg_dialog::display(_('Could not run ldap2zone'), _('Could not find the primary server'), ERROR_DIALOG);
+      } else {
+        $serverTabs = objects::open(key($servers), 'server');
+        if ($serverTabs->by_object['argonautClient']->is_account) {
+          $s_daemon = new supportDaemon();
+          if ($s_daemon->is_error()) {
+            msg_dialog::display(_('Could not run ldap2zone'), msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
+            );
+          } else {
+            $target = array($serverTabs->getBaseObject()->macAddress);
+            $res    = $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);
+            } else {
+              msg_dialog::display(_('Ldap2zone'), sprintf(_('Ldap2Zone called for zone "%s"'), $zoneName), INFO_DIALOG);
+            }
+          }
+        } else {
+          msg_dialog::display(_('Error'), _('Argonaut client needs to be activated to use ldap2zone remotely'), ERROR_DIALOG);
+        }
+      }
+    }
+  }
 }
 ?>
diff --git a/dns/admin/dns/class_dnsView.inc b/dns/admin/dns/class_dnsView.inc
index 6ac361bd43710749f9f8f3c0d41520de2289a99d..8da010e05cd5e9c3afb07a2960b3adcf78a4e2f8 100644
--- a/dns/admin/dns/class_dnsView.inc
+++ b/dns/admin/dns/class_dnsView.inc
@@ -34,7 +34,7 @@ class dnsView extends simplePlugin
         'icon'        => 'geticon.php?context=applications&icon=dns&size=16'
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/dns/admin/dns/class_dnsZone.inc b/dns/admin/dns/class_dnsZone.inc
index e2b0a645e7768c7232ad16a1955d23434b932f88..0d721bb0d416a5d5e0903f96bb2632d3fe830496 100644
--- a/dns/admin/dns/class_dnsZone.inc
+++ b/dns/admin/dns/class_dnsZone.inc
@@ -490,7 +490,7 @@ class dnsZone extends simplePlugin
         'mainAttr'    => 'zoneName'
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/dns/admin/systems/class_dnsHost.inc b/dns/admin/systems/class_dnsHost.inc
index 59aca4d9521dde7a6865c0f2611a6a4da828c96c..b9c2ff7efa6d79b27c669f9ec7d9edcc38e502fe 100644
--- a/dns/admin/systems/class_dnsHost.inc
+++ b/dns/admin/systems/class_dnsHost.inc
@@ -78,7 +78,7 @@ class DnsRecordsFilteredAttribute extends DnsRecordsAttribute
     }
     $ips    = $this->plugin->parent->getBaseObject()->ipHostNumber;
     $cn     = preg_replace('/\$$/', '', $this->plugin->parent->getBaseObject()->cn);
-    if (in_array($values[2], $ips) || ($values[0] == $cn) || preg_match('/'.preg_quote($cn.'.'.$this->getZoneName(), '/').'/', $value[2])) {
+    if (in_array($values[2], $ips) || ($values[0] == $cn) || preg_match('/'.preg_quote($cn.'.'.$this->getZoneName(), '/i').'/', $value[2])) {
       return $values;
     } else {
       return array();
@@ -128,7 +128,7 @@ class dnsHost extends simplePlugin
         'fdDNSZoneDn' => 'dnsZone'
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -266,13 +266,13 @@ class dnsHost extends simplePlugin
           if ($this->parent->by_object['argonautClient']->is_account) {
             $s_daemon = new supportDaemon();
             if ($s_daemon->is_error()) {
-              msg_dialog::display(_('Could not get run ldap2zone'), msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
+              msg_dialog::display(_('Could not run ldap2zone'), msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
               );
             } else {
               $target = array($this->parent->getBaseObject()->macAddress);
               $res    = $s_daemon->append_call('Ldap2Zone.start', $target, array('args' => array($zone)));
               if ($s_daemon->is_error()) {
-                msg_dialog::display(_('Could not get run ldap2zone'), msgPool::siError($s_daemon->get_error()), ERROR_DIALOG);
+                msg_dialog::display(_('Could not run ldap2zone'), msgPool::siError($s_daemon->get_error()), ERROR_DIALOG);
               } else {
                 msg_dialog::display(_('Ldap2zone'), sprintf(_('Ldap2Zone called for zone "%s"'), $zone), INFO_DIALOG);
               }
diff --git a/dns/config/dns/class_dnsConfig.inc b/dns/config/dns/class_dnsConfig.inc
index 9fd4ddc3f4a390b39c63d473b8bf3f4b42ff2d73..e6fb8c1e800c4261f5bed4bb60f32e51a200d94a 100644
--- a/dns/config/dns/class_dnsConfig.inc
+++ b/dns/config/dns/class_dnsConfig.inc
@@ -31,7 +31,7 @@ class dnsConfig extends simplePlugin
       "plCategory"      => array("configuration"),
       "plObjectType"    => array("smallConfig"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/dns/locale/ar/fusiondirectory.po b/dns/locale/ar/fusiondirectory.po
index 2fcab59dca3ba069e51c644a272dbcb35706396c..616e7e93e894c0a0ed5f95320cf46970edb0ab0f 100644
--- a/dns/locale/ar/fusiondirectory.po
+++ b/dns/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "أنظمة"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "خطأ"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "خطأ"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/ca/fusiondirectory.po b/dns/locale/ca/fusiondirectory.po
index 2ae8fa582d5d9e9ec7caf26d83142ad56e39c5d5..5a898dc5eec38320715d90e957a40e1b8409e253 100644
--- a/dns/locale/ca/fusiondirectory.po
+++ b/dns/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Error"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/cs_CZ/fusiondirectory.po b/dns/locale/cs_CZ/fusiondirectory.po
index 48a53941155ff5cf01e3bd670781ee6ee923579b..a5fe63925850c6042e0ba73dc1a6f14686a31f6e 100644
--- a/dns/locale/cs_CZ/fusiondirectory.po
+++ b/dns/locale/cs_CZ/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -129,6 +129,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Systémy"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Chyba"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -386,7 +421,7 @@ msgstr "Obsah"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -554,27 +589,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Chyba"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/de/fusiondirectory.po b/dns/locale/de/fusiondirectory.po
index 03b2ba53feb5e03f75000a58c338fa69cb0530e2..72a199e200850ebddc0f3072839705199577b315 100644
--- a/dns/locale/de/fusiondirectory.po
+++ b/dns/locale/de/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -129,6 +129,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Systeme"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Fehler"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -386,7 +421,7 @@ msgstr "Inhalt"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -554,27 +589,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Fehler"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/el_GR/fusiondirectory.po b/dns/locale/el_GR/fusiondirectory.po
index 01a7313ce29f1179759ef62a2a8b4d73ba0adb87..dd68b542c4ed942bd3afe3e8551f7e90bec6a00c 100644
--- a/dns/locale/el_GR/fusiondirectory.po
+++ b/dns/locale/el_GR/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -130,6 +130,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Systems"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -387,7 +422,7 @@ msgstr "Περιεχόμενο"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -555,27 +590,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/en/fusiondirectory.po b/dns/locale/en/fusiondirectory.po
index 6ccd95b07fb832cb325981a6ab6af04c1e4fbce1..76af5abb24427e539ec1ce3b2b6afc936ea73d1c 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,61 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -388,35 +419,10 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -550,40 +556,48 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/es/fusiondirectory.po b/dns/locale/es/fusiondirectory.po
index d911756d9d2d4da3348fa5a9a281fd6bb29d5a0e..d13269127f57b028dfa84c319e4692be3f1f29e4 100644
--- a/dns/locale/es/fusiondirectory.po
+++ b/dns/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Error"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr "Contenido"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/es_CO/fusiondirectory.po b/dns/locale/es_CO/fusiondirectory.po
index 162bafb6fb08f0dea0a6096eeb4a42de7fff78ec..555561b27051b952459f4076f88849296014dfe0 100644
--- a/dns/locale/es_CO/fusiondirectory.po
+++ b/dns/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Error"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/es_VE/fusiondirectory.po b/dns/locale/es_VE/fusiondirectory.po
index 46689e2b74f2f9d43a3107e0c9beadff45e25a17..6d1369111944cd4f55fd3cdf14e3bfb08b31e4df 100644
--- a/dns/locale/es_VE/fusiondirectory.po
+++ b/dns/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Error"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr "Contenido"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/fa_IR/fusiondirectory.po b/dns/locale/fa_IR/fusiondirectory.po
index 8301355a294bd42a81d097bf5519c261cebb5622..f7023f69a0a9ef4ad815e5cdf5dd7acd292901df 100644
--- a/dns/locale/fa_IR/fusiondirectory.po
+++ b/dns/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "خطا"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "خطا"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/fi_FI/fusiondirectory.po b/dns/locale/fi_FI/fusiondirectory.po
index 2dec0972806cf53096c66ee368c3645ddf74766f..803441915c1ebeb9e023eeac53ed367ad407c4af 100644
--- a/dns/locale/fi_FI/fusiondirectory.po
+++ b/dns/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-14 18:38+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Virhe"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Virhe"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/fr/fusiondirectory.po b/dns/locale/fr/fusiondirectory.po
index 6240c5cbb1130facd27fcba3b8780410d0fa2ff0..dedab93bc2cbe9c105f105f2fcb89e9ab3d3646a 100644
--- a/dns/locale/fr/fusiondirectory.po
+++ b/dns/locale/fr/fusiondirectory.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:08+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -130,6 +130,41 @@ msgstr "Gestion des DNS"
 msgid "Systems"
 msgstr "Systèmes"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr "Impossible de lancer ldap2zone"
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr "Plus d'un serveur correspond au SOA"
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr "Impossible de trouver le serveur primaire"
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr "Impossible de lancer ldap2zone"
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr "Ldap2zone"
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr "LDAP2Zone appelé pour la zone \"%s\""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Erreur"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr "Le client Argonaut doit être activé pour utiliser ldap2zone à distance"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -387,7 +422,7 @@ msgstr "Contenu"
 msgid "Content of this record"
 msgstr "Contenu de cet enregistrement"
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 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"
 
@@ -555,27 +590,6 @@ msgstr "Les enregistrements DNS pour la zone \"%s\""
 msgid "The primary server for zone \"%s\""
 msgstr "Le serveur principal pour la zone \"%s\""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr "Impossible de lancer ldap2zone"
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr "Ldap2zone"
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr "LDAP2Zone appelé pour la zone \"%s\""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Erreur"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr "Le client Argonaut doit être activé pour utiliser ldap2zone à distance"
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/hu_HU/fusiondirectory.po b/dns/locale/hu_HU/fusiondirectory.po
index 9ccfa4bda4c6349c9289d6b48273c925991c5cdb..3b84496d3047fb2d3fd8fba04799aeabf7d64093 100644
--- a/dns/locale/hu_HU/fusiondirectory.po
+++ b/dns/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/id/fusiondirectory.po b/dns/locale/id/fusiondirectory.po
index 1aad8d3f2e2da9a88bc7fa7b5f58b928e5a698e1..fff74ddba08c0fa9c32fea726b3546007e7d9211 100644
--- a/dns/locale/id/fusiondirectory.po
+++ b/dns/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/it_IT/fusiondirectory.po b/dns/locale/it_IT/fusiondirectory.po
index ed866c03f0155754afce46c880777022d4036d1d..bc3ff55acc2564109136b9a5e8cc427b16765556 100644
--- a/dns/locale/it_IT/fusiondirectory.po
+++ b/dns/locale/it_IT/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:21+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:21+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -130,6 +130,41 @@ msgstr "Gestione DNS"
 msgid "Systems"
 msgstr "Sistemi"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr "Impossibile eseguire ldap2zone"
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr "Più di un server corrisponde al SOA"
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr "Impossibile trovare il server primario"
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr "Impossibile ottenere run ldap2zone"
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr "Zona LDAP2"
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr "Ldap2Zone chiamata per la zona \"%s\""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Errore"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr "Il cliente Argonaut dev'essere attivato per utilizzare ldap2zone a distanza"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -387,7 +422,7 @@ msgstr "Contenuto"
 msgid "Content of this record"
 msgstr "Contenuto di questo record"
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "L'IP immesso non corrisponde alla zona inversa selezionata"
 
@@ -555,27 +590,6 @@ msgstr "Records DNS par la zona \"%s\""
 msgid "The primary server for zone \"%s\""
 msgstr "Server primario per la zona \"%s\""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr "Impossibile ottenere run ldap2zone"
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr "Zona LDAP2"
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr "Ldap2Zone chiamata per la zona \"%s\""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Errore"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr "Il cliente Argonaut dev'essere attivato per utilizzare ldap2zone a distanza"
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/lv/fusiondirectory.po b/dns/locale/lv/fusiondirectory.po
index 5c6a25423c58f85079deb5db492cb516df4265d8..c9535fd77ac3b38a50396f60c8edf88fdd23780f 100644
--- a/dns/locale/lv/fusiondirectory.po
+++ b/dns/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Kļūda"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Kļūda"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/nb/fusiondirectory.po b/dns/locale/nb/fusiondirectory.po
index cb90911891efcb49bca518ae25f7fdd97296d62d..e12cd3b3524707da0546b14a5227ec811dad6b57 100644
--- a/dns/locale/nb/fusiondirectory.po
+++ b/dns/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Feil"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Feil"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/nl/fusiondirectory.po b/dns/locale/nl/fusiondirectory.po
index 5a09019105ab1cd13a5c47eb843ed7fe5a424bbb..5cf516b08348439c53fee5615e031f8b8c2a1b79 100644
--- a/dns/locale/nl/fusiondirectory.po
+++ b/dns/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Systemen"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Fout"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr "Inhoud"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Fout"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/pl/fusiondirectory.po b/dns/locale/pl/fusiondirectory.po
index 9622a9aaf5ddc05c6afc6b9e4f8df7372b7c02f6..cb83ebe4801b7817ebf3b4bf51f92ba781f8d893 100644
--- a/dns/locale/pl/fusiondirectory.po
+++ b/dns/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Systemy"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/pt/fusiondirectory.po b/dns/locale/pt/fusiondirectory.po
index f0a436bebe82c499d4a94285908f7b8e6fd0a7c5..42619eadd7266054d5fc18d9c5ca4e756be9d2fe 100644
--- a/dns/locale/pt/fusiondirectory.po
+++ b/dns/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Erro"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/pt_BR/fusiondirectory.po b/dns/locale/pt_BR/fusiondirectory.po
index d76bbcee98d92f9cdfb8027afe58c35f26534305..86a4959164d8db94cc881e7d7973dcf760a612cc 100644
--- a/dns/locale/pt_BR/fusiondirectory.po
+++ b/dns/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Erro"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr "Conteúdo"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/ru/fusiondirectory.po b/dns/locale/ru/fusiondirectory.po
index c84ececc8e0337391d7009fbabff884275b71167..c32fffb15500988504d84b7677a6cc72fae3f00e 100644
--- a/dns/locale/ru/fusiondirectory.po
+++ b/dns/locale/ru/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-08 19:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -129,6 +129,41 @@ msgstr "Управление DNS"
 msgid "Systems"
 msgstr "Системы"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr "Ldap2zone"
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Ошибка"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -386,7 +421,7 @@ msgstr "Содержимое"
 msgid "Content of this record"
 msgstr "Содержимое записи"
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "Введенный IP не соответствует выбранной обратной зоне"
 
@@ -554,27 +589,6 @@ msgstr "DNS записи для зоны \"%s\""
 msgid "The primary server for zone \"%s\""
 msgstr "Первичный сервер для зоны \"%s\""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr "Ldap2zone"
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Ошибка"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/ru@petr1708/fusiondirectory.po b/dns/locale/ru@petr1708/fusiondirectory.po
index 0c4841acb07ac5a421715d7f70aa2f561fb38bfe..a7920bf49fe02d692a573ec9e3a8b13c29c72730 100644
--- a/dns/locale/ru@petr1708/fusiondirectory.po
+++ b/dns/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/sv/fusiondirectory.po b/dns/locale/sv/fusiondirectory.po
index adf37000d479adceb10f0712afc0148eb5b11dfa..1ef8af0ffabf0d025fd1669ff64b940129f3f6e0 100644
--- a/dns/locale/sv/fusiondirectory.po
+++ b/dns/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "System"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Fel"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr "Innehåll"
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Fel"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/ug/fusiondirectory.po b/dns/locale/ug/fusiondirectory.po
index 7b180d3a11b04261550ba1c70c5342044220dacf..dd5fb388b63a4bd45f0dd0be980364c9d74b1102 100644
--- a/dns/locale/ug/fusiondirectory.po
+++ b/dns/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/vi_VN/fusiondirectory.po b/dns/locale/vi_VN/fusiondirectory.po
index 5d04da10e964fd0e60332787e1199867a898494d..df029a15e904a5240e43ddb0bfd6729b00807867 100644
--- a/dns/locale/vi_VN/fusiondirectory.po
+++ b/dns/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "Các hệ thống"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Lá»—i"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Lá»—i"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dns/locale/zh/fusiondirectory.po b/dns/locale/zh/fusiondirectory.po
index 9374214e81699e86aed3cdf4ae1b1f29a1cbc09c..a761403ce11e5b0a19b888031fab7eb7a3c85cf3 100644
--- a/dns/locale/zh/fusiondirectory.po
+++ b/dns/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +128,41 @@ msgstr ""
 msgid "Systems"
 msgstr "系统设置"
 
+#: admin/dns/class_dnsManagement.inc:98 admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:106 admin/systems/class_dnsHost.inc:269
+#: admin/systems/class_dnsHost.inc:275
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:98
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:100
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "错误"
+
+#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -385,7 +420,7 @@ msgstr ""
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:425
+#: admin/dns/class_DnsRecordAttribute.inc:426
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -553,27 +588,6 @@ msgstr ""
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "错误"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr ""
-
 #: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
diff --git a/dovecot/admin/systems/services/dovecot/class_serviceDovecot.inc b/dovecot/admin/systems/services/dovecot/class_serviceDovecot.inc
index b1c77b993ed5f474fc349aa0fa706d43ddbf4a88..4613c0d79a21d50f9e978d4a8ae6d92e709fda67 100644
--- a/dovecot/admin/systems/services/dovecot/class_serviceDovecot.inc
+++ b/dovecot/admin/systems/services/dovecot/class_serviceDovecot.inc
@@ -29,7 +29,7 @@ class serviceDovecot extends simpleService
       'plDescription'   => _('Dovecot (IMAP/POP3)').' ('._('Services').')',
       'plIcon'          => 'geticon.php?context=applications&icon=dovecot&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -103,12 +103,15 @@ class serviceDovecot extends simpleService
     );
   }
 
+  function save()
+  {
+    parent::save();
+  }
+
   protected function post_save()
   {
     parent::post_save();
-    if (!$this->initially_was_account) {
-      mailMethod::resetMailServersCache();
-    }
+    mailMethod::resetMailServersCache();
   }
 
   protected function post_remove ()
diff --git a/dovecot/locale/ar/fusiondirectory.po b/dovecot/locale/ar/fusiondirectory.po
index b9f282910e7932887033f55d9f7659367c3cabf5..8b5f578d1f531a97badcec3343555e7a22d76497 100644
--- a/dovecot/locale/ar/fusiondirectory.po
+++ b/dovecot/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/dovecot/locale/ca/fusiondirectory.po b/dovecot/locale/ca/fusiondirectory.po
index 3e592bea29eeaa81b8112bc31bd196376b491c97..f3e03568d1924e1c5585ec3cb501224c4310cca0 100644
--- a/dovecot/locale/ca/fusiondirectory.po
+++ b/dovecot/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/dovecot/locale/cs_CZ/fusiondirectory.po b/dovecot/locale/cs_CZ/fusiondirectory.po
index 1edadb80ca503ec8af104ee69ee75efd141c504d..2f4cef6ddf514a5f434cd5d62c10fcb69d6f0ecc 100644
--- a/dovecot/locale/cs_CZ/fusiondirectory.po
+++ b/dovecot/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/dovecot/locale/de/fusiondirectory.po b/dovecot/locale/de/fusiondirectory.po
index fde8fa1abdf87b1dc09fe168e8509a7643bbb093..aae39e800538b45c7fc28ba9228c05bb8b0ec915 100644
--- a/dovecot/locale/de/fusiondirectory.po
+++ b/dovecot/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/dovecot/locale/el_GR/fusiondirectory.po b/dovecot/locale/el_GR/fusiondirectory.po
index 98b314cbf3a94a6c2fd3e657d67acca8d7c0745f..ca64b95bfc58202ebb05c746f75c0eaf8a47ec63 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/dovecot/locale/en/fusiondirectory.po b/dovecot/locale/en/fusiondirectory.po
index fadd11a5f380748ba2ac90585a4c58cd41f45174..66757f85968853b7e6409e90358dc533f2c82744 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/es/fusiondirectory.po b/dovecot/locale/es/fusiondirectory.po
index 4e6a7a36d216d3c14f5e472034004c43d9de9a60..7ca8b3764655cdbbde7a103d379c6933d28ec2fd 100644
--- a/dovecot/locale/es/fusiondirectory.po
+++ b/dovecot/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/dovecot/locale/es_CO/fusiondirectory.po b/dovecot/locale/es_CO/fusiondirectory.po
index e99e1dbfa9e15fbebc8ed8f126c02041d5b3fdd2..6b7447775b1b11f1190426c04f2ce486ccff4254 100644
--- a/dovecot/locale/es_CO/fusiondirectory.po
+++ b/dovecot/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/dovecot/locale/es_VE/fusiondirectory.po b/dovecot/locale/es_VE/fusiondirectory.po
index 4f3da5a4e2473e3f02626e4c286dcf7f40c97a56..6df750a274b3c61c23ce835451035368f6d32529 100644
--- a/dovecot/locale/es_VE/fusiondirectory.po
+++ b/dovecot/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/dovecot/locale/fa_IR/fusiondirectory.po b/dovecot/locale/fa_IR/fusiondirectory.po
index 9f7ed6d0094be23bca8d072f07e2e13f2ce87578..c8f5bb415a44b987fb50e9e1a6b341a765ee4473 100644
--- a/dovecot/locale/fa_IR/fusiondirectory.po
+++ b/dovecot/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/dovecot/locale/fi_FI/fusiondirectory.po b/dovecot/locale/fi_FI/fusiondirectory.po
index 15221a7d720bc31c1c3ec22cec98a762910f6296..431de8955b0b8694826e9cc1b952109ffe2ce7bb 100644
--- a/dovecot/locale/fi_FI/fusiondirectory.po
+++ b/dovecot/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:39+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/dovecot/locale/fr/fusiondirectory.po b/dovecot/locale/fr/fusiondirectory.po
index 70f5924252c97088b5a1fe884a1cef40e5aefb1f..962191ba18922cab32453d21536c65bea5c04aa3 100644
--- a/dovecot/locale/fr/fusiondirectory.po
+++ b/dovecot/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:17+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/dovecot/locale/hu_HU/fusiondirectory.po b/dovecot/locale/hu_HU/fusiondirectory.po
index ed0414a18025aa8bc8f3bed807c73352d773afe5..4d2d74fe1e11ff2882f877c29f420c4c99144e2d 100644
--- a/dovecot/locale/hu_HU/fusiondirectory.po
+++ b/dovecot/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/dovecot/locale/id/fusiondirectory.po b/dovecot/locale/id/fusiondirectory.po
index 1397864866d99c9008c75df63db9acdfcb4124fc..174b2ade7d8c376ad9fff951a0d97fc192e5fcf9 100644
--- a/dovecot/locale/id/fusiondirectory.po
+++ b/dovecot/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/dovecot/locale/it_IT/fusiondirectory.po b/dovecot/locale/it_IT/fusiondirectory.po
index 88cb8bd33d0e414010cf80b6396767cd783e4532..9c04a1b4b408a84eb85b79001264487b118b1ed7 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:22+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/dovecot/locale/lv/fusiondirectory.po b/dovecot/locale/lv/fusiondirectory.po
index ac012801522b80f5f76f187adf768644dda6ea02..dc246044d97fb2bbb137916181a2a836224e0835 100644
--- a/dovecot/locale/lv/fusiondirectory.po
+++ b/dovecot/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/dovecot/locale/nb/fusiondirectory.po b/dovecot/locale/nb/fusiondirectory.po
index 772908876ef7a8bd0562f6253eb0f08c6b0208b6..849ed05e24a925cd6b9f1c02f2d0dc86af114b29 100644
--- a/dovecot/locale/nb/fusiondirectory.po
+++ b/dovecot/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/dovecot/locale/nl/fusiondirectory.po b/dovecot/locale/nl/fusiondirectory.po
index 9b7e673042cd2a358738b2d5617be491739754e8..00868dc9ea0b5af9856d980c660867d9e5b6751a 100644
--- a/dovecot/locale/nl/fusiondirectory.po
+++ b/dovecot/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/dovecot/locale/pl/fusiondirectory.po b/dovecot/locale/pl/fusiondirectory.po
index a3ebe3f3d940e69c4417bc3cf58a7dac9ce61872..40881b427cca0885444e1962fbc8cf84d2d3c8fd 100644
--- a/dovecot/locale/pl/fusiondirectory.po
+++ b/dovecot/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/dovecot/locale/pt/fusiondirectory.po b/dovecot/locale/pt/fusiondirectory.po
index 16260b5c79e4e8c2dcb5ae341fa00fef51a70e03..f8df30166fc7a036b9a00578931a9b6bede4dd5a 100644
--- a/dovecot/locale/pt/fusiondirectory.po
+++ b/dovecot/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/dovecot/locale/pt_BR/fusiondirectory.po b/dovecot/locale/pt_BR/fusiondirectory.po
index f1d8a86ff267ab5f78910fae9d7665e0b1d0e719..f8dc0f12356d3cce83a32acbf409819ad8fc7f9c 100644
--- a/dovecot/locale/pt_BR/fusiondirectory.po
+++ b/dovecot/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/dovecot/locale/ru/fusiondirectory.po b/dovecot/locale/ru/fusiondirectory.po
index bb991022ca32433ab596c9052d99853176d85d9c..3b66ea0931af318b4e55fa55ab5d58164a395e13 100644
--- a/dovecot/locale/ru/fusiondirectory.po
+++ b/dovecot/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-24 12:43+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/dovecot/locale/ru@petr1708/fusiondirectory.po b/dovecot/locale/ru@petr1708/fusiondirectory.po
index 7283bd4a2e476f34834ce6b3291d178ebd0aab58..2bfb3742e9f9b36419c4c18d746b175fd131b328 100644
--- a/dovecot/locale/ru@petr1708/fusiondirectory.po
+++ b/dovecot/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/dovecot/locale/sv/fusiondirectory.po b/dovecot/locale/sv/fusiondirectory.po
index 92da055648483561190d7c3d874d07fa27fda779..71994eac3b082248fe52d0fd9e9c12ad90b32b93 100644
--- a/dovecot/locale/sv/fusiondirectory.po
+++ b/dovecot/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/dovecot/locale/ug/fusiondirectory.po b/dovecot/locale/ug/fusiondirectory.po
index 15a12d93ac812e7e9753e68943d820bd233b07bf..0b8097662ec28568f4140e08ab8a352af1856ec5 100644
--- a/dovecot/locale/ug/fusiondirectory.po
+++ b/dovecot/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/dovecot/locale/vi_VN/fusiondirectory.po b/dovecot/locale/vi_VN/fusiondirectory.po
index 58a429fcd9927d6d250d195a813f512abce09fa2..7759840946a264ffe31c1bd5a2f9d743270a70c7 100644
--- a/dovecot/locale/vi_VN/fusiondirectory.po
+++ b/dovecot/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/dovecot/locale/zh/fusiondirectory.po b/dovecot/locale/zh/fusiondirectory.po
index 186186234d41cad4325d44eeaf2c23fe787a1564..ef8ff32a7b1f8074503463974d0ec0bdb6497bd5 100644
--- a/dovecot/locale/zh/fusiondirectory.po
+++ b/dovecot/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/dsa/admin/dsa/class_dsaManagement.inc b/dsa/admin/dsa/class_dsaManagement.inc
index 2fc847d5485b3eaa4e5211f93bceb575204c6ceb..b4c873d1bbdbaa64b3503aa8cace29cc8375da13 100644
--- a/dsa/admin/dsa/class_dsaManagement.inc
+++ b/dsa/admin/dsa/class_dsaManagement.inc
@@ -27,7 +27,7 @@ class dsaManagement extends simpleManagement
   protected $departmentRootVisible  = TRUE;
   protected $baseMode               = TRUE;
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling */
   public static function plInfo()
   {
     return array(
diff --git a/dsa/admin/dsa/class_simpleSecurityObject.inc b/dsa/admin/dsa/class_simpleSecurityObject.inc
index cffae2312a455ce07db09123418baae53cd0bf51..bc3d42f92b2cd992dc082195d1b54f4cdc9a1fc6 100644
--- a/dsa/admin/dsa/class_simpleSecurityObject.inc
+++ b/dsa/admin/dsa/class_simpleSecurityObject.inc
@@ -24,7 +24,7 @@ class simpleSecurityObject extends simplePlugin
 
   var $objectclasses = array('organizationalRole', 'top', 'simpleSecurityObject');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling */
   public static function plInfo()
   {
     return array(
@@ -38,7 +38,7 @@ class simpleSecurityObject extends simplePlugin
         'icon'        => 'geticon.php?context=applications&icon=dsa&size=16',
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/dsa/config/dsa/class_dsaConfig.inc b/dsa/config/dsa/class_dsaConfig.inc
index 5f1935b88e2e69732e2bf58cb35d90618c4dd8b7..bb2844518c095f47da947d469cbaec7b12ec90fb 100644
--- a/dsa/config/dsa/class_dsaConfig.inc
+++ b/dsa/config/dsa/class_dsaConfig.inc
@@ -31,7 +31,7 @@ class dsaConfig extends simplePlugin
       "plCategory"      => array("configuration"),
       "plObjectType"    => array("smallConfig"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/dsa/locale/ar/fusiondirectory.po b/dsa/locale/ar/fusiondirectory.po
index 939a7e0efb9c81b146e458caabada7fd49c3fa23..b5d3153e8a7579ff740e587c20fac4bf2afd3d06 100644
--- a/dsa/locale/ar/fusiondirectory.po
+++ b/dsa/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/dsa/locale/ca/fusiondirectory.po b/dsa/locale/ca/fusiondirectory.po
index 4151c9dfeace9beab49c7d548f7d17ee268ac597..6b4817d503765289d3c51d7112b7a10c9e891d63 100644
--- a/dsa/locale/ca/fusiondirectory.po
+++ b/dsa/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/dsa/locale/cs_CZ/fusiondirectory.po b/dsa/locale/cs_CZ/fusiondirectory.po
index 372ca5d9f3f7342215a096727696650d4c0e2d9c..6d7d9b2b02d30e487d1a7e90ccc05c33479ea670 100644
--- a/dsa/locale/cs_CZ/fusiondirectory.po
+++ b/dsa/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/dsa/locale/de/fusiondirectory.po b/dsa/locale/de/fusiondirectory.po
index 5c3ea6958c946bb89574bfd7e35ca849b60441d0..27012daa22df17b271b4346b501da83aea683358 100644
--- a/dsa/locale/de/fusiondirectory.po
+++ b/dsa/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/dsa/locale/el_GR/fusiondirectory.po b/dsa/locale/el_GR/fusiondirectory.po
index 2c68ecfc98478c38af0269ab8660aa8508659619..6284b61f56055dbfd83951487d686c0d5df64aec 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/dsa/locale/en/fusiondirectory.po b/dsa/locale/en/fusiondirectory.po
index a2887512548622dccf55bd959e98bd1a890f22b0..a141169764dec00756655b2a90b32b240172853b 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/es/fusiondirectory.po b/dsa/locale/es/fusiondirectory.po
index 142feebddd15afbda83029e2a63ca448b693bce7..412e728fb62257f13478e800dadd208403121792 100644
--- a/dsa/locale/es/fusiondirectory.po
+++ b/dsa/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/dsa/locale/es_CO/fusiondirectory.po b/dsa/locale/es_CO/fusiondirectory.po
index a412ca4709df32e0eab4c4d2a5b3af56dc64c259..007eeb9c027a70a45de2e1662f803278e37e30b9 100644
--- a/dsa/locale/es_CO/fusiondirectory.po
+++ b/dsa/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/dsa/locale/es_VE/fusiondirectory.po b/dsa/locale/es_VE/fusiondirectory.po
index 132707634f7b034cd8311b8dad52240fea8fffd4..7abf6c30ffb1ea28511eb99c707bb9578eadbd5b 100644
--- a/dsa/locale/es_VE/fusiondirectory.po
+++ b/dsa/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/dsa/locale/fa_IR/fusiondirectory.po b/dsa/locale/fa_IR/fusiondirectory.po
index 1ac9f7e5d369d72f2c889dee70e61492dbe4485a..d739827f8d3d0f4f87c64516fe641ba12d2a5f22 100644
--- a/dsa/locale/fa_IR/fusiondirectory.po
+++ b/dsa/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/dsa/locale/fi_FI/fusiondirectory.po b/dsa/locale/fi_FI/fusiondirectory.po
index 3c680f85329aff4802d5de9364a97e22b649852c..8ea7a7cc67b19bd6ed4a6c48d5b36f2479152101 100644
--- a/dsa/locale/fi_FI/fusiondirectory.po
+++ b/dsa/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/dsa/locale/fr/fusiondirectory.po b/dsa/locale/fr/fusiondirectory.po
index ee15481c4679b2cfd14fea1be73595ec6dacc01c..1d5410259594a5b89a5ac6098eb2a5ed7b583710 100644
--- a/dsa/locale/fr/fusiondirectory.po
+++ b/dsa/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/dsa/locale/hu_HU/fusiondirectory.po b/dsa/locale/hu_HU/fusiondirectory.po
index dffd1ef234dc23bc6d9b02014b7611851621a118..b7077b2953147c0014a29c8e3d124233a2d3295e 100644
--- a/dsa/locale/hu_HU/fusiondirectory.po
+++ b/dsa/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/dsa/locale/id/fusiondirectory.po b/dsa/locale/id/fusiondirectory.po
index bab6f6731f25a270731922df1905b0546570e296..0d480c1641dca0da40e0809660c9b757ba96c1de 100644
--- a/dsa/locale/id/fusiondirectory.po
+++ b/dsa/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/dsa/locale/it_IT/fusiondirectory.po b/dsa/locale/it_IT/fusiondirectory.po
index cb5206c93ab4e7cefc01a17640e8a4e10f404e44..dc7a0ca693751755276ed0c0a734fb7b841da83d 100644
--- a/dsa/locale/it_IT/fusiondirectory.po
+++ b/dsa/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:22+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/dsa/locale/lv/fusiondirectory.po b/dsa/locale/lv/fusiondirectory.po
index e5889a65176041368f808942a13eaf16520c6e90..ecf71f1e4cf42a88257190f432953b9e1738b6e4 100644
--- a/dsa/locale/lv/fusiondirectory.po
+++ b/dsa/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/dsa/locale/nb/fusiondirectory.po b/dsa/locale/nb/fusiondirectory.po
index 815bcb6f3dc2d41559cd4f2db87d14d248c3125a..e6bca9f98b6ecd410e6db7546be7f5023371572a 100644
--- a/dsa/locale/nb/fusiondirectory.po
+++ b/dsa/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/dsa/locale/nl/fusiondirectory.po b/dsa/locale/nl/fusiondirectory.po
index d431a9028d4d94fcace1f7feca429c4200368eea..f28bf900f5d4878d0ae34e5116975617f4ff429b 100644
--- a/dsa/locale/nl/fusiondirectory.po
+++ b/dsa/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/dsa/locale/pl/fusiondirectory.po b/dsa/locale/pl/fusiondirectory.po
index 072ac1c5c9601984d6bc5314eea4644a8cb8173e..cf546624f7b864afd19622196066f4e05083256e 100644
--- a/dsa/locale/pl/fusiondirectory.po
+++ b/dsa/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/dsa/locale/pt/fusiondirectory.po b/dsa/locale/pt/fusiondirectory.po
index 67942ad39797354613a1769363c82c6a279f93b6..171cd377424d4ec6d4474f4b88307d0f799c4e4a 100644
--- a/dsa/locale/pt/fusiondirectory.po
+++ b/dsa/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/dsa/locale/pt_BR/fusiondirectory.po b/dsa/locale/pt_BR/fusiondirectory.po
index 0623263713c761851ca17924c01da1856f6e8754..977dd12aef716406def1377009ac9972478b2b7b 100644
--- a/dsa/locale/pt_BR/fusiondirectory.po
+++ b/dsa/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/dsa/locale/ru/fusiondirectory.po b/dsa/locale/ru/fusiondirectory.po
index fa01996a1045e92f8d2ef5ada6d0dd1a77e8f510..4612ce1ea477a1a6148d655e5ca9b719971944e1 100644
--- a/dsa/locale/ru/fusiondirectory.po
+++ b/dsa/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/dsa/locale/ru@petr1708/fusiondirectory.po b/dsa/locale/ru@petr1708/fusiondirectory.po
index 79797b61f4664ccd47aee6397a7e0509d4b52983..c06bcec976554713bbed6da22bff3ba6a807c71f 100644
--- a/dsa/locale/ru@petr1708/fusiondirectory.po
+++ b/dsa/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/dsa/locale/sv/fusiondirectory.po b/dsa/locale/sv/fusiondirectory.po
index c2cb23bbc028198d8452033bafce12cfb37642bc..470c2c9e333b0d4f3e301ca4406237e3ecd1be10 100644
--- a/dsa/locale/sv/fusiondirectory.po
+++ b/dsa/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/dsa/locale/ug/fusiondirectory.po b/dsa/locale/ug/fusiondirectory.po
index 966734490a70881417ba1c9fb8320561f4380914..c5508f6a1f19ef6643a04171c2a0c7901ff1aa74 100644
--- a/dsa/locale/ug/fusiondirectory.po
+++ b/dsa/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/dsa/locale/vi_VN/fusiondirectory.po b/dsa/locale/vi_VN/fusiondirectory.po
index 63077868a69a442ace52d0012ae76c49e6882e6c..38d0d407181278d83c435811d4f4f0bdd34911e0 100644
--- a/dsa/locale/vi_VN/fusiondirectory.po
+++ b/dsa/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/dsa/locale/zh/fusiondirectory.po b/dsa/locale/zh/fusiondirectory.po
index 1fbe0079764bb1b5fbdb0aeeb2441c4b96e29a01..9eaada64b6d67ddfc36bb91f8ab0bb9d6e1f529f 100644
--- a/dsa/locale/zh/fusiondirectory.po
+++ b/dsa/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/ejbca/admin/ejbca/certificates/class_ejbcaCertificates.inc b/ejbca/admin/ejbca/certificates/class_ejbcaCertificates.inc
index 4bd6d941ced340c3becced6f848aeaedd9e6f837..bf3f54c4121cada28b6146080e29ec04f5c11250 100644
--- a/ejbca/admin/ejbca/certificates/class_ejbcaCertificates.inc
+++ b/ejbca/admin/ejbca/certificates/class_ejbcaCertificates.inc
@@ -36,7 +36,7 @@ class ejbcaCertificates extends simplePlugin
         'fdEjbcaCertDN' => 'ejbcaCertificate',
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ejbca/admin/ejbca/class_ejbcaCertificate.inc b/ejbca/admin/ejbca/class_ejbcaCertificate.inc
index cc92c5a34a635dae06c55f90aa1906e1906e9d71..a6e93be58a6d129dbf6d7242fcb7d87b30262349 100644
--- a/ejbca/admin/ejbca/class_ejbcaCertificate.inc
+++ b/ejbca/admin/ejbca/class_ejbcaCertificate.inc
@@ -36,7 +36,7 @@ class ejbcaCertificate extends simplePlugin
         'icon'        => 'geticon.php?context=applications&icon=ejbca&size=16'
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ejbca/config/ejbca/class_ejbcaConfig.inc b/ejbca/config/ejbca/class_ejbcaConfig.inc
index 1567044206ec41a8b05917385139b6068c25711b..99bc130bd67af71f21fc7b1d87db878cff5c5462 100644
--- a/ejbca/config/ejbca/class_ejbcaConfig.inc
+++ b/ejbca/config/ejbca/class_ejbcaConfig.inc
@@ -31,7 +31,7 @@ class ejbcaConfig extends simplePlugin
       "plCategory"      => array("configuration"),
       "plObjectType"    => array("smallConfig"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ejbca/locale/ar/fusiondirectory.po b/ejbca/locale/ar/fusiondirectory.po
index 62e9d75549e230353faf449aadda0f1ac45753ca..679aa21e58e41f1f85ccee49d1cceda4208ed1a8 100644
--- a/ejbca/locale/ar/fusiondirectory.po
+++ b/ejbca/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/ejbca/locale/ca/fusiondirectory.po b/ejbca/locale/ca/fusiondirectory.po
index a66d1fe4c33e7f5276a6bb6139af83294e976dbf..a62aeed3fd5c0a5f0fc7ec45311af44387c88826 100644
--- a/ejbca/locale/ca/fusiondirectory.po
+++ b/ejbca/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/ejbca/locale/cs_CZ/fusiondirectory.po b/ejbca/locale/cs_CZ/fusiondirectory.po
index c2de9da74298f26742560e6c418d71233492067a..7a18e7e485791299ae8a1354102261f23d1a7a57 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/ejbca/locale/de/fusiondirectory.po b/ejbca/locale/de/fusiondirectory.po
index e8081bbef9ae56c8b87bdb9c82e90ee6aab1d189..d0972c35935096cc97bf5d8e81fa34bd5084b09e 100644
--- a/ejbca/locale/de/fusiondirectory.po
+++ b/ejbca/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/ejbca/locale/el_GR/fusiondirectory.po b/ejbca/locale/el_GR/fusiondirectory.po
index 199b94b1d532295a686710f7556022a685943fa3..e16c967d96ce5166e546bab3f0a16314b21f435a 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/ejbca/locale/en/fusiondirectory.po b/ejbca/locale/en/fusiondirectory.po
index 7c06b48b74852d16209a2b605a37b84ff9d0146c..f14b752f46a6ab2ba543f2f5e764a0f9603a6949 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/es/fusiondirectory.po b/ejbca/locale/es/fusiondirectory.po
index 3c35267c0b2c2320872541e738ff154a846467c4..70f234ece007980dad64ab84c9e7c9198844c037 100644
--- a/ejbca/locale/es/fusiondirectory.po
+++ b/ejbca/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/ejbca/locale/es_CO/fusiondirectory.po b/ejbca/locale/es_CO/fusiondirectory.po
index 5c19cbc409722cf0fab56198163679c939d5b7ac..03b352865f12418ee2d5ab1ea32b908860d945ea 100644
--- a/ejbca/locale/es_CO/fusiondirectory.po
+++ b/ejbca/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/ejbca/locale/es_VE/fusiondirectory.po b/ejbca/locale/es_VE/fusiondirectory.po
index 66a9b30f10ca05dcc6534b4ab8fe8f1ea8ab8971..c3641fcc5353d7c05cb87887a6c2a2fa23071083 100644
--- a/ejbca/locale/es_VE/fusiondirectory.po
+++ b/ejbca/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/ejbca/locale/fa_IR/fusiondirectory.po b/ejbca/locale/fa_IR/fusiondirectory.po
index 01662d02578b9d015b0acd0976ff73c9d68464a8..9ac347f880ebdd6513ad585b59057449ef0d990e 100644
--- a/ejbca/locale/fa_IR/fusiondirectory.po
+++ b/ejbca/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/ejbca/locale/fi_FI/fusiondirectory.po b/ejbca/locale/fi_FI/fusiondirectory.po
index af50f88059340d62c106d96648d2966f380928e2..36ad0e5bc6a133da71f11bc3b58f67401202390f 100644
--- a/ejbca/locale/fi_FI/fusiondirectory.po
+++ b/ejbca/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/ejbca/locale/fr/fusiondirectory.po b/ejbca/locale/fr/fusiondirectory.po
index 5a951da26ea6b2380c3f0d989c741238fb4a15a9..7b032a5d7c11ed13466bec5a1324ab275f622990 100644
--- a/ejbca/locale/fr/fusiondirectory.po
+++ b/ejbca/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/ejbca/locale/hu_HU/fusiondirectory.po b/ejbca/locale/hu_HU/fusiondirectory.po
index 5b7aa307eb418e91c943000a24c42e6f54ec7a96..c457420e9067704b705d064bd8ce02e8d49220c7 100644
--- a/ejbca/locale/hu_HU/fusiondirectory.po
+++ b/ejbca/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/ejbca/locale/id/fusiondirectory.po b/ejbca/locale/id/fusiondirectory.po
index 2267c714e1b09b61d83dd492d510efc23f743f6d..7714254ac2af87f671a0f817571084b1e8e5bb08 100644
--- a/ejbca/locale/id/fusiondirectory.po
+++ b/ejbca/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/ejbca/locale/it_IT/fusiondirectory.po b/ejbca/locale/it_IT/fusiondirectory.po
index c9db62a2dc2ac11613abc56fb18ec535d0581731..d9c103fdcf8bf81bbd76b432cb71377d1afaf8ba 100644
--- a/ejbca/locale/it_IT/fusiondirectory.po
+++ b/ejbca/locale/it_IT/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:22+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/ejbca/locale/lv/fusiondirectory.po b/ejbca/locale/lv/fusiondirectory.po
index d8e095b13d135db4ca6bcf5e9b9e3cd3ba309268..869c4fbbb498b2e8b25a6b3438b4176d0f7f27d5 100644
--- a/ejbca/locale/lv/fusiondirectory.po
+++ b/ejbca/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/ejbca/locale/nb/fusiondirectory.po b/ejbca/locale/nb/fusiondirectory.po
index b153152f8cd9241353e46df51ed0524d95bbd62b..b8397497845c5a4e3a99d4acd989ff2ed99ac3ed 100644
--- a/ejbca/locale/nb/fusiondirectory.po
+++ b/ejbca/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/ejbca/locale/nl/fusiondirectory.po b/ejbca/locale/nl/fusiondirectory.po
index 94cbe41ed7fe6172c1d5554d904f704393ecf747..6170d2cd24eb774ccb53f73d703be2d416239b1a 100644
--- a/ejbca/locale/nl/fusiondirectory.po
+++ b/ejbca/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/ejbca/locale/pl/fusiondirectory.po b/ejbca/locale/pl/fusiondirectory.po
index 715025b5e8118bd223310b3c6cb46e7139672b04..323e7a57fc7820c37cc3a92d81549814ffeb64a5 100644
--- a/ejbca/locale/pl/fusiondirectory.po
+++ b/ejbca/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/ejbca/locale/pt/fusiondirectory.po b/ejbca/locale/pt/fusiondirectory.po
index b3609a8ecaf4386c33fc55b149abab695cc87cb7..82d78f6ce63f4db6b8ccf78db52458602d22ee79 100644
--- a/ejbca/locale/pt/fusiondirectory.po
+++ b/ejbca/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/ejbca/locale/pt_BR/fusiondirectory.po b/ejbca/locale/pt_BR/fusiondirectory.po
index 92bae9924119cd83f987b5343cbda2c4d6aaf6ca..2ccee9815678f83edf6886c045285893eff48516 100644
--- a/ejbca/locale/pt_BR/fusiondirectory.po
+++ b/ejbca/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/ejbca/locale/ru/fusiondirectory.po b/ejbca/locale/ru/fusiondirectory.po
index b85384a7f4bb474002b64cd944d6b6277311445d..91ea07366ffec284569c5daba3eb1b10d2849fdc 100644
--- a/ejbca/locale/ru/fusiondirectory.po
+++ b/ejbca/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/ejbca/locale/ru@petr1708/fusiondirectory.po b/ejbca/locale/ru@petr1708/fusiondirectory.po
index 0ceecae25ed87b15a3f5db60cebd0617d156c93a..8da09c13acae5bb1e5528024294c002b005b16a4 100644
--- a/ejbca/locale/ru@petr1708/fusiondirectory.po
+++ b/ejbca/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/ejbca/locale/sv/fusiondirectory.po b/ejbca/locale/sv/fusiondirectory.po
index 06dc8170d71021569b578c7de6c5cfc545430488..0926a74fac7621dfbd41f6d6c8bb1432931c8410 100644
--- a/ejbca/locale/sv/fusiondirectory.po
+++ b/ejbca/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/ejbca/locale/ug/fusiondirectory.po b/ejbca/locale/ug/fusiondirectory.po
index f1fe1ca474e3358de75356d4600de713efbc599b..fc07be9be9cf030363ba6bf7fafbb6830bc4c26c 100644
--- a/ejbca/locale/ug/fusiondirectory.po
+++ b/ejbca/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/ejbca/locale/vi_VN/fusiondirectory.po b/ejbca/locale/vi_VN/fusiondirectory.po
index e282d9ddf96f0d3b62963c2c6160d47dead65289..9513d4cb79e3002ed5b655e719fe047003ae3d53 100644
--- a/ejbca/locale/vi_VN/fusiondirectory.po
+++ b/ejbca/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/ejbca/locale/zh/fusiondirectory.po b/ejbca/locale/zh/fusiondirectory.po
index 9c6e809db0f18c8515521ae6e5fd22b36cfa2b10..85f74d9431202fa0800a59a8bffe9bb593d1d55f 100644
--- a/ejbca/locale/zh/fusiondirectory.po
+++ b/ejbca/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/fai/admin/fai/class_faiHook.inc b/fai/admin/fai/class_faiHook.inc
index 5ab435c4d0385aa3a210a703e2c605c7ae8205df..63e09545942cad213cc6f5f055e169b4c36662f2 100644
--- a/fai/admin/fai/class_faiHook.inc
+++ b/fai/admin/fai/class_faiHook.inc
@@ -37,7 +37,7 @@ class faiHook extends faiSimplePluginClass
         )
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/fai/class_faiPackage.inc b/fai/admin/fai/class_faiPackage.inc
index a6f0d42dac5ded868e1526541779e4d8e7889468..1014ce6e9a2dc18da82882f10178698e9b4270e9 100644
--- a/fai/admin/fai/class_faiPackage.inc
+++ b/fai/admin/fai/class_faiPackage.inc
@@ -23,9 +23,6 @@ class PackageSelectDialog extends GenericSelectDialog
 {
   protected $dialogClass = 'packageSelect';
 
-  protected $post_cancel = 'packageSelect_cancel';
-  protected $post_finish = 'packageSelect_save';
-
   function handle_finish ()
   {
     $result = $this->dialog->detectPostActions();
@@ -159,27 +156,27 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
   protected function genRowIcons($key, $value)
   {
     $id = $this->getHtmlId();
-    list ($img, $width) = parent::genRowIcons($key, $value);
+    list ($img, $nbicons) = parent::genRowIcons($key, $value);
     $key64 = base64_encode($key);
     if (preg_match('/\-$/', $value)) {
       $img = '<input type="image" src="geticon.php?context=actions&icon=add&size=16"'.
               ' name="'.$id.'_removal_'.$key64.'" class="center" alt="'._('Mark for installation').'" title="'._('Mark for installation').'"/>'.
-              '&nbsp;'.$img;
+              $img;
     } else {
       $img = '<input type="image" src="geticon.php?context=actions&icon=remove&size=16"'.
               ' name="'.$id.'_removal_'.$key64.'" class="center" alt="'._('Mark for removal').'" title="'._('Mark for removal').'"/>'.
-              '&nbsp;'.$img;
+              $img;
     }
     if (isset($this->buffer[$key]['HASTEMPLATE']) && $this->buffer[$key]['HASTEMPLATE']) {
       $img = '<input type="image" src="geticon.php?context=actions&icon=package-configure&size=16"'.
               ' name="'.$id.'_config_'.$key64.'" class="center" alt="'._('Edit configuration').'" title="'._('Edit configuration').'"/>'.
-              '&nbsp;'.$img;
+              $img;
     } else {
       $img = '<img src="images/empty.png" alt="" style="width:16px;"/>'.$img;
     }
-    $width += 32;
+    $nbicons += 2;
 
-    return array ($img, $width);
+    return array ($img, $nbicons);
   }
 
   protected function handleAddAndEditValue()
@@ -390,7 +387,7 @@ class faiPackage extends faiSimplePluginClass
         )
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/fai/class_faiPartition.inc b/fai/admin/fai/class_faiPartition.inc
index b3f628be1ad4173d6a3827032cc837bcd9b03240..4cf52183d3fd95dbc338c8c8aa682950b2da4e6b 100644
--- a/fai/admin/fai/class_faiPartition.inc
+++ b/fai/admin/fai/class_faiPartition.inc
@@ -167,7 +167,7 @@ class FaiPartitionSizeAttribute extends CompositeAttribute
   function writeValues($values)
   {
     if ($values[0] == 'remaining') {
-      return '-';
+      return '0-';
     }
     $value = $values[1].$values[2];
     if ($values[0] == 'dynamic') {
diff --git a/fai/admin/fai/class_faiPartitionTable.inc b/fai/admin/fai/class_faiPartitionTable.inc
index caa3bf58e735300792431354136eda746351624b..ea64b7ab283900db9703c90746083d5b19df4f08 100644
--- a/fai/admin/fai/class_faiPartitionTable.inc
+++ b/fai/admin/fai/class_faiPartitionTable.inc
@@ -292,7 +292,7 @@ class faiPartitionTable extends faiSimplePluginClass
         )
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/fai/class_faiProfile.inc b/fai/admin/fai/class_faiProfile.inc
index 932ae22fca8aae4cea99af544eb3fbff9ecf7221..781d367a857a21492ab4be0f95dd70aad59c8cfe 100644
--- a/fai/admin/fai/class_faiProfile.inc
+++ b/fai/admin/fai/class_faiProfile.inc
@@ -38,7 +38,7 @@ class faiProfile extends faiSimplePluginClass
           'icon'        => 'geticon.php?context=applications&icon=fai-profile&size=16'
         )
       ),
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/fai/class_faiScript.inc b/fai/admin/fai/class_faiScript.inc
index 42ca41519cc16a0bae4932cf7a620b8528d5c710..a8de21d828a1198f2f4b4c92a2e498821ef70e91 100644
--- a/fai/admin/fai/class_faiScript.inc
+++ b/fai/admin/fai/class_faiScript.inc
@@ -39,7 +39,7 @@ class faiScript extends faiSimplePluginClass
         )
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/fai/class_faiTemplate.inc b/fai/admin/fai/class_faiTemplate.inc
index 58e05a6fd11dac03fbf5748e6b2ecb0f138cf8b2..19d8417e00ddc24c170de91be9d071e9a96720d0 100644
--- a/fai/admin/fai/class_faiTemplate.inc
+++ b/fai/admin/fai/class_faiTemplate.inc
@@ -160,7 +160,7 @@ class faiTemplate extends faiSimplePluginClass
         )
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/fai/class_faiVariable.inc b/fai/admin/fai/class_faiVariable.inc
index 7bd89c1d973977ec633a024f33054265505b62ad..968e96c59da8c295ba3b1e2c31da16adf120be96 100644
--- a/fai/admin/fai/class_faiVariable.inc
+++ b/fai/admin/fai/class_faiVariable.inc
@@ -37,7 +37,7 @@ class faiVariable extends faiSimplePluginClass
         )
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/fai/packageSelect/class_filterFAIPackages.inc b/fai/admin/fai/packageSelect/class_filterFAIPackages.inc
index d2ab5172e4936b60686a67c09e464c101cd0af9f..d8379d57de6dd5c171ec5686d239da041d74500a 100644
--- a/fai/admin/fai/packageSelect/class_filterFAIPackages.inc
+++ b/fai/admin/fai/packageSelect/class_filterFAIPackages.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
@@ -20,12 +19,13 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class filterFAIPackages {
+class filterFAIPackages extends filterLDAPBlacklist
+{
 
-  static function query($parent,$base, $scope, $filter, $attributes, $category, $objectStorage= "")
+  static function query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = '')
   {
     $customs = array();
-    foreach($parent->customs as $custom) {
+    foreach ($parent->customs as $custom) {
       if ($parent->elementValues[$custom] == 'true') {
         $customs[] = $custom;
       }
@@ -34,27 +34,27 @@ class filterFAIPackages {
     $pkgs       = array();
     $q          = new supportDaemon();
     $filter     = array("$filter");
-    $attrs      = array("distribution", "package", "version", "section", "timestamp");
+    $attrs      = array('distribution', 'package', 'version', 'section', 'timestamp');
     $release    = session::get('packageSelect_Release');
-    $ret        = $q->FAI_get_packages($release,$attrs,$filter,0,200);
+    $ret        = $q->FAI_get_packages($release, $attrs, $filter, 0, 200);
     if ($q->is_error()) {
-      msg_dialog::display(_("Infrastructure service"), msgPool::siError($q->get_error()), ERROR_DIALOG);
+      msg_dialog::display(_('Infrastructure service'), msgPool::siError($q->get_error()), ERROR_DIALOG);
     } else {
-      for ($i = 0;(count($ret)<200) && ($i<count($customs));$i++) {
-        $ret2 = $q->FAI_get_packages($customs[$i],$attrs,$filter,0,200-count($ret));
+      for ($i = 0;(count($ret) < 200) && ($i < count($customs));$i++) {
+        $ret2 = $q->FAI_get_packages($customs[$i], $attrs, $filter, 0, 200 - count($ret));
         if ($q->is_error()) {
-          msg_dialog::display(_("Infrastructure service"), msgPool::siError($q->get_error()), ERROR_DIALOG);
+          msg_dialog::display(_('Infrastructure service'), msgPool::siError($q->get_error()), ERROR_DIALOG);
           return array();
         }
-        $ret = array_merge($ret,$ret2);
+        $ret = array_merge($ret, $ret2);
       }
-      foreach($ret as $attr) {
-        $attr['objectClass'] = "FAKE_OC__FaiPackage";
+      foreach ($ret as $attr) {
+        $attr['objectClass'] = 'FAKE_OC__FaiPackage';
 
         $item = array();
-        $item['dn']     = "dn=".$attr['PACKAGE'].",".$attr['DISTRIBUTION'].",".$base;
+        $item['dn']     = 'dn='.$attr['PACKAGE'].','.$attr['DISTRIBUTION'].','.$base;
         $item['count']  = 0;
-        foreach($attr as $key => $value) {
+        foreach ($attr as $key => $value) {
           $item['count']++;
           $item[] = $key;
           $item[$key] = array('count' => 1, $value);
@@ -63,40 +63,21 @@ class filterFAIPackages {
       }
     }
 
-    return filterLDAPBlacklist::filterByBlacklist($pkgs);
-  }
-
-  static function filterByBlacklist($entries)
-  {
-    if (session::is_set('filterBlacklist')) {
-      $blist = session::get('filterBlacklist');
-      foreach($blist as $attr_name => $attr_values) {
-        foreach($attr_values as $match) {
-          foreach($entries as $id => $entry) {
-            if (isset($entry[$attr_name])) {
-              $test = $entry[$attr_name];
-              if (!is_array($test)) $test = array($test);
-              if (in_array($match, $test)) unset($entries[$id]);
-            }
-          }
-        }
-      }
-    }
-    return array_values($entries);
+    return static::filterByBlacklist($pkgs);
   }
 
   function save()
   {
     $act = $this->detectPostActions();
     $headpage = $this->getHeadpage();
-    if (!isset($act['targets'])) return(array());
+    if (!isset($act['targets'])) {
+      return array();
+    }
     $ret = array();
     foreach ($act['targets'] as $dn) {
       $ret[] = $headpage->getEntry($dn);
     }
     return $ret;
   }
-
 }
-
 ?>
diff --git a/fai/admin/fai/packageSelect/class_packageSelect.inc b/fai/admin/fai/packageSelect/class_packageSelect.inc
index 9923840314d4972298785cef6caeea6cd8940010..73a6e414a9d9fab50fe18b8a1a3c704ec884f332 100644
--- a/fai/admin/fai/packageSelect/class_packageSelect.inc
+++ b/fai/admin/fai/packageSelect/class_packageSelect.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
@@ -20,20 +19,26 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class packageSelect extends management
+class packageSelect extends simpleSelectManagement
 {
-  protected $skipFooter = TRUE;
-  protected $skipHeader = TRUE;
+  protected $objectTypes  = array();
+  protected $autoFilter   = FALSE;
+
+  protected $departmentBrowser      = FALSE;
+  protected $departmentRootVisible  = FALSE;
+  protected $baseMode               = FALSE;
 
   function __construct()
   {
-    $filter = new filterFAIcustoms(get_template_path("selectPackage-filter.xml", TRUE, dirname(__FILE__)));
-    $this->setFilter($filter);
+    $this->filterXMLPath  = get_template_path('selectPackage-filter.xml', TRUE, dirname(__FILE__));
+    $this->listXMLPath    = get_template_path('selectPackage-list.xml',   TRUE, dirname(__FILE__));
 
-    // Build headpage
-    $headpage = new listing(get_template_path("selectPackage-list.xml", TRUE, dirname(__FILE__)));
-    $headpage->setFilter($filter);
-    parent::__construct("FAI-packages", $headpage);
+    if (!session::global_is_set(get_class($this).'_filter')) {
+      $filter = new filterFAIcustoms($this->filterXMLPath);
+      session::global_set(get_class($this).'_filter', $filter);
+    }
+
+    parent::__construct();
   }
 
   function save()
@@ -47,7 +52,5 @@ class packageSelect extends management
     }
     return $ret;
   }
-
 }
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
diff --git a/fai/admin/fai/packageSelect/selectPackage-filter.tpl b/fai/admin/fai/packageSelect/selectPackage-filter.tpl
index 3d0e8cd9e84fe11021cb1b1ad7b0d243b65243c4..c74a6e9a79f50d535028f6cd993e5c150f2a9b03 100644
--- a/fai/admin/fai/packageSelect/selectPackage-filter.tpl
+++ b/fai/admin/fai/packageSelect/selectPackage-filter.tpl
@@ -1,40 +1,21 @@
 <div class="contentboxh">
- <p class="contentboxh">
-  {t}Filter{/t}
- </p>
+ <p>{t}Filter{/t}</p>
 </div>
 
 <div class="contentboxb">
+  <p style="margin:0;padding:3px;">
+    {t}A maximum of 200 entries will be shown here.{/t}
+  </p>
 
- <div style='padding: 3px;'>
-  {t}A maximum of 200 entries will be shown here.{/t}
- </div>
+  {foreach from=$customs key=key item=value}
+    {$value}<label for="{$key}">&nbsp;custom {$key}</label><br/>
+  {/foreach}
 
-<div style='padding:4px;'>
-{foreach from=$customs key=key item=value}
-  {$value}
-  <label for="{$key}">custom {$key}</label><br/>
-{/foreach}
-</div>
+  <hr/>
 
- <table style="width:100%;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td>
-    <label for="NAME">
-     <img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;{t}Name{/t}
-    </label>
-   </td>
-   <td>
-    {$NAME}
-   </td>
-  </tr>
- </table>
+  <label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16"/></label>{$NAME}
 
- <table  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td style="width:100%;text-align:right;">
+  <div>
     {$APPLY}
-   </td>
-  </tr>
- </table>
+  </div>
 </div>
diff --git a/fai/admin/fai/packageSelect/selectPackage-filter.xml b/fai/admin/fai/packageSelect/selectPackage-filter.xml
index df5654830d97cd856a793aade7427e9493400b04..febabf2851e867ae9d2390e17fa35d5335f52c2a 100644
--- a/fai/admin/fai/packageSelect/selectPackage-filter.xml
+++ b/fai/admin/fai/packageSelect/selectPackage-filter.xml
@@ -18,14 +18,6 @@
     <scope>auto</scope>
   </search>
 
-  <element>
-    <type>checkbox</type>
-    <tag>CUSTOMCALIBRE7</tag>
-    <default>false</default>
-    <unset></unset>
-    <set>(&amp;(objectClass=FAIclass)(FAIstate=__NETBOOT__))</set>
-  </element>
-
   <element>
     <type>textfield</type>
     <tag>NAME</tag>
diff --git a/fai/admin/fai/packageSelect/selectPackage-list.tpl b/fai/admin/fai/packageSelect/selectPackage-list.tpl
deleted file mode 100644
index 4ee80189204aebbfb750067b21dcf150bdf919db..0000000000000000000000000000000000000000
--- a/fai/admin/fai/packageSelect/selectPackage-list.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<table style="width:100%;height:100%; vertical-align:top; text-align:left;">
-  <tr>
-    <td style="vertical-align:top; width:100%;">
-      <div class="contentboxh">
-        <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
-      </div>
-
-      <div class="contentboxb">
-       <div style='background:white;padding:3px;'>
-        <table><tr>
-          <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td class="optional">{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td>
-          <td><input class='center' type='image' src='geticon.php?context=actions&icon=submit&size=16' align='middle' title='{t}Update{/t}' name='submit_department' alt='{t}Submit{/t}'>&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td> {$ACTIONS}</td>
-        </tr></table>
-       </div>
-      </div>
-
-      <div style='height:4px;'>
-      </div>
-      {$LIST}
-    </td>
-    <td style='vertical-align:top;min-width:250px'>
-      {$FILTER}
-    </td>
-  </tr>
-</table>
-
-<p class="plugbottom">
-  <input type=submit name="packageSelect_save" value="{msgPool type=addButton}">
-  &nbsp;
-  <input type=submit name="packageSelect_cancel" value="{msgPool type=cancelButton}">
-</p>
-
-<input type="hidden" name="ignore">
diff --git a/fai/admin/fai/packageSelect/selectPackage-list.xml b/fai/admin/fai/packageSelect/selectPackage-list.xml
index b054dbd0ea8377a3536af283310122d6150b3438..08e9cb3aeb6f77197b0cba6e3186b5898c05c76c 100644
--- a/fai/admin/fai/packageSelect/selectPackage-list.xml
+++ b/fai/admin/fai/packageSelect/selectPackage-list.xml
@@ -6,18 +6,18 @@
     <departmentRootVisible>false</departmentRootVisible>
     <baseMode>false</baseMode>
     <multiSelect>true</multiSelect>
-    <template>../plugins/admin/fai/packageSelect/selectPackage-list.tpl</template>
+    <template>simple-select-list.tpl</template>
+    <module>simple</module>
     <label>Please select the desired entries</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
-      <label>FAI</label>
+      <label>Package</label>
       <objectClass>FAKE_OC__FaiPackage</objectClass>
       <category>faiPackage</category>
       <class>faiPackage</class>
       <image>geticon.php?context=applications&amp;icon=fai-packages&amp;size=16</image>
     </objectType>
-
   </definition>
 
   <table>
@@ -58,5 +58,4 @@
 
   <actiontriggers snapshot="false" copypaste="false">
   </actiontriggers>
-
 </list>
diff --git a/fai/admin/systems/class_faiLogView.inc b/fai/admin/systems/class_faiLogView.inc
index 8c165249062e06c45139b33aecab7884fb5d5db5..53e42c9817d81f543440c90b0135624ce5d918d7 100644
--- a/fai/admin/systems/class_faiLogView.inc
+++ b/fai/admin/systems/class_faiLogView.inc
@@ -168,7 +168,7 @@ class faiLogView extends simplePlugin
     );
   }
 
-  /* Return plugin informations */
+  /* Return plugin information */
   static function plInfo()
   {
     return array(
@@ -177,7 +177,7 @@ class faiLogView extends simplePlugin
       'plPriority'    => 30,
       'plObjectType'  => array('workstation', 'server', 'ogroup-dynamic'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/systems/services/monitor/class_argonautFAIMonitor.inc b/fai/admin/systems/services/monitor/class_argonautFAIMonitor.inc
index 107387fd8aa88f5e1d066341db47749047cf23b3..1a9d5f6e9c8cb99698da220f1e0bf82e835d5e59 100644
--- a/fai/admin/systems/services/monitor/class_argonautFAIMonitor.inc
+++ b/fai/admin/systems/services/monitor/class_argonautFAIMonitor.inc
@@ -29,7 +29,7 @@ class argonautFAIMonitor extends simpleService
       'plDescription'   => _('Argonaut FAI monitor settings'),
       'plIcon'          => 'geticon.php?context=applications&icon=fai&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/admin/systems/services/repository/class_serviceRepository.inc b/fai/admin/systems/services/repository/class_serviceRepository.inc
index 19729ce8ec5ac2e466fd1d4ac2e70fd4be1bf0fd..669d6eea1991faa7a12e2fca32df82ef71595df4 100644
--- a/fai/admin/systems/services/repository/class_serviceRepository.inc
+++ b/fai/admin/systems/services/repository/class_serviceRepository.inc
@@ -161,7 +161,7 @@ class serviceRepository extends simpleService
       'plDescription' => _('Package repository information'),
       'plIcon'        => 'geticon.php?context=mimetypes&icon=package-x-generic&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -215,7 +215,7 @@ class serviceRepository extends simpleService
     foreach ($repos as $repo) {
       $release = $repo[2];
       if (($repo[4] == 'install') && (!isset($done[$release]))) {
-        self::createBranch($repo[7], $release);
+        static::createBranch($repo[7], $release);
         $done[$release] = TRUE;
       }
     }
@@ -304,7 +304,7 @@ class serviceRepository extends simpleService
   static function getCustomReleases($release)
   {
     $list     = array();
-    $servers  = self::getServers();
+    $servers  = static::getServers();
 
     foreach ($servers as $server) {
       if (strtolower($server['INSTALL']) == strtolower("custom:$release")) {
diff --git a/fai/config/fai/class_faiConfig.inc b/fai/config/fai/class_faiConfig.inc
index da6a0f76428fb873fbc1bdf9fcd4c7d970f77095..2188770a6470d208e4d7386f503ead09271952b7 100644
--- a/fai/config/fai/class_faiConfig.inc
+++ b/fai/config/fai/class_faiConfig.inc
@@ -30,7 +30,7 @@ class faiConfig extends simplePlugin
       'plSelfModify'    => FALSE,
       'plObjectType'    => array('configuration'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fai/locale/ar/fusiondirectory.po b/fai/locale/ar/fusiondirectory.po
index 1f7bb776e71de7413a08b1ecad3309ffaeddcd7a..944c8ef9dee3f75075b17d1322797787bf70b420 100644
--- a/fai/locale/ar/fusiondirectory.po
+++ b/fai/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr ""
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "خطأ"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "الخواص"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "الوصف"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "الإسم"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/ca/fusiondirectory.po b/fai/locale/ca/fusiondirectory.po
index 8d641a47591fe592f3d6fad1519e21e444d7d3f8..678526875588e1a0a295e511e57b33039db72738 100644
--- a/fai/locale/ca/fusiondirectory.po
+++ b/fai/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nom"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/cs_CZ/fusiondirectory.po b/fai/locale/cs_CZ/fusiondirectory.po
index 23ff0ff5b0639437680305c8e61929266fb23c45..7d37e58ff2e123b86556d9209f84fb0370d14993 100644
--- a/fai/locale/cs_CZ/fusiondirectory.po
+++ b/fai/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr "Nastavení zásuvného modulu fai pro FusionDirectory"
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr "Profil FAI a vydání, které má být použito na tento počítač"
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Vydání"
 
@@ -83,7 +82,7 @@ msgstr "Sada nastavení"
 msgid "FAI profil to be applied to this computer"
 msgstr "Profil FAI, který má být použit na tento počítač"
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Repozitář"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr "Vydání použité v tomto repozitáři"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "oddíly"
 
@@ -182,7 +181,7 @@ msgstr "Repozitáře, které se nacházejí na tomto serveru"
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Chyba LDAP"
 
@@ -227,53 +226,53 @@ msgstr "Složka pro záznamy protokolů"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr "Složka ve které argonaut-fai-monitor ukládá své záznamy událostí"
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr "Seřadit sestupně"
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr "Seřadit vzestupně"
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Soubor"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Datum"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Protokoly k dispozici"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Vybraný protokol"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr "Obsah zvoleného protokolu"
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr "Protokoly FAI"
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr "Prohlížeč protokolu FAI"
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Chyba"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr "Zvolený soubor"
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr "Zvolený soubor: %s"
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr "tabulka dělení úložiště pro FAI"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Vlastnosti"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr "Název třídy tabulky oddílů"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Popis"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr "Přístup"
 msgid "Access rights"
 msgstr "Přístupová práva"
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr "Označit k instalaci"
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr "Označit k odstranění"
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr "Upravit nastavení"
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr "Služba Infrastruktura"
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr "Neznámé balíčky"
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Balíček"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "Seznam balíčků pro FAI instalaci"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr "FAI balíček"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Název třídy proměnných"
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr "Týkající se vydání distribuce Debian"
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr "Sekce, kterých se týká"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "způsob instalace"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr "Způsob kterým mají být nainstalovány balíčky z tohoto seznamu"
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "balíčky"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr "Balíčky v této třídě"
 
@@ -492,7 +492,6 @@ msgstr "Zařízení"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Název"
 
@@ -954,7 +953,7 @@ msgstr "Pořadí přednosti tohoto skriptu (nižší číslo znamená dřívěj
 msgid "The script itself"
 msgstr "Skript samotný"
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Vyberte požadované položky"
 
@@ -969,11 +968,3 @@ msgstr "Filtr"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Nebude zde zobrazeno více než 200 položek."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Aktualizovat"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Potvrdit"
diff --git a/fai/locale/de/fusiondirectory.po b/fai/locale/de/fusiondirectory.po
index e887a0c551261ededdc8e6f29784e3ebb249313b..25affe445b34c7041d361c0a26e82bd87532aa57 100644
--- a/fai/locale/de/fusiondirectory.po
+++ b/fai/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr "FusionDirectory fai Plugin-Konfiguration"
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr "FAI Profil und Veröffentlichung, die auf diesen Rechner angewendet werd
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Release"
 
@@ -83,7 +82,7 @@ msgstr "Profil"
 msgid "FAI profil to be applied to this computer"
 msgstr "FAI-Profil welches auf diesem Rechner angewendet werden soll"
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Repository"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "Sektionen"
 
@@ -182,7 +181,7 @@ msgstr "Repositories, die dieser Server bereitstellt"
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -227,53 +226,53 @@ msgstr "Log Verzeichnis"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr "Absteigend sortieren"
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr "Aufsteigend sortieren"
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Datei"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Datum"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Verfügbare Protokolle"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Ausgewähltes Protokoll"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr "Inhalt des ausgewählten Protokolls"
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr "FAI-Protokolle"
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr "FAI-Protokollbetrachter"
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr "Ausgewählte Datei"
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr "Ausgewählte Datei: %s"
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr "FAI-Partitionstabelle"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Eigenschaften"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr "Partitionstabellen-Klassenname"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr "Zugriff"
 msgid "Access rights"
 msgstr "Zugriffsrechte"
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr "Zur Installation markieren"
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr "Zum entfernen vormerken"
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr "Konfiguration bearbeiten"
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr "Infrastrukturdienst"
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr "Unbekannte Pakete"
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paket"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "FAI-Paketliste"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr "FAI Paket"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Variablenklassenname"
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr "Debian-Version betreffend"
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Installations-Methode"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr "Für diese Paketliste zu verwendende Installationsmethode"
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Pakete"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr "Pakete in dieser Klasse"
 
@@ -492,7 +492,6 @@ msgstr "Gerät"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Name"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr "Das Skript selbst"
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Bitte wählen Sie die gewünschten Einträge"
 
@@ -969,11 +968,3 @@ msgstr "Filter"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Es werden maximal 200 Einträge angezeigt."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Ãœbertragen"
diff --git a/fai/locale/el_GR/fusiondirectory.po b/fai/locale/el_GR/fusiondirectory.po
index 1c560268526efc914dffaa6fb7309c0548a56685..ab6eb35da65b562ec542b810ead8d82ca7d20c1c 100644
--- a/fai/locale/el_GR/fusiondirectory.po
+++ b/fai/locale/el_GR/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,6 @@ msgstr "Ρύθμιση προσθέτου FusionDirectory fai"
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -69,7 +68,7 @@ msgstr "Προφίλ FAI και έκδοση για να εφαρμοστεί σ
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Έκδοση"
 
@@ -85,7 +84,7 @@ msgstr "Προφίλ"
 msgid "FAI profil to be applied to this computer"
 msgstr "Προφίλ FAI για να εφαρμοστεί σε αυτόν τον υπολογιστή"
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Αποθετήριο"
 
@@ -114,7 +113,7 @@ msgid "Release used on this repository"
 msgstr "Έκδοση που χρησιμοποιήθηκε αυτό το αποθετήριο"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "Ενότητες"
 
@@ -184,7 +183,7 @@ msgstr "Αποθετήρια που φιλοξενεί αυτός ο εξυπη
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
@@ -229,53 +228,53 @@ msgstr "Κατάλογος καταγραφών"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr "Ταξινόμηση προς τα πάνω"
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr "Ταξινόμηση προς τα κάτω"
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Αρχείο"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Διαθέσιμες καταγραφές"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Επιλεγμένο αρχείο καταγραφής"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr "Το περιεχόμενο του επιλεγμένου αρχείου καταγραφής"
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr "Καταγραφές FAI "
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr "Εφαρμογή προβολής καταγραφών FAI "
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr "Επιλεγμένο αρχείο"
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr "Επιλεγμένο αρχείο: %s"
@@ -298,7 +297,7 @@ msgid "FAI partition table"
 msgstr "Πίνακας κατατμήσεων FAI"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -306,7 +305,7 @@ msgid "Properties"
 msgstr "Ιδιότητες"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -317,7 +316,7 @@ msgid "Partition table class name"
 msgstr "Όνομα κλάσης πίνακα κατατμήσεων"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -327,7 +326,7 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -394,67 +393,68 @@ msgstr "Πρόσβαση"
 msgid "Access rights"
 msgstr "Δικαιώματα πρόσβασης"
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr "Σήμανση για εγκατάσταση"
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr "Σήμανση για απεγκατάσταση"
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr "Επεξεργασία ρυθμίσεων"
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr "Άγνωτη υποδομή"
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr "Άγνωστα πακέτα"
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Πακέτο"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "Λίστα πακέτων FAI "
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr "Πακέτο FAI"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Όνομα κλάσης μεταβλητών"
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr "Έκδοση Debian που σχετίζεται"
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr "Ενότητες που σχετίζονται"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Μέθοδος εγκατάστασης"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr "Μ'εθοδος εγκατάστασης για αυτή τη λίστα πακέτων"
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Πακέτα"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr "Πακέτα σε αυτή την κλάση"
 
@@ -494,7 +494,6 @@ msgstr "Συσκευή"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Όνομα"
 
@@ -956,7 +955,7 @@ msgstr "Προτεραιότητα αυτού του σεναρίου (το μι
 msgid "The script itself"
 msgstr "Το σενάριο εντολών"
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Παρακαλώ επιλέξτε τις επιθυμητλες εγγραφές"
 
@@ -971,11 +970,3 @@ msgstr "Φίλτρο"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Το μέγιστο 200 εγγραφές θα φαίνονται εδώ."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Ενημέρωση"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Υποβολή"
diff --git a/fai/locale/en/fusiondirectory.po b/fai/locale/en/fusiondirectory.po
index 1c75fbba4241b456087cf31563fbf8f21d9bb498..3cbdb3b525c6b52b96d768f4add98c6674aeb3a0 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,269 +17,325 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:64 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
-#: admin/systems/services/repository/class_serviceRepository.inc:257
-msgid "LDAP error"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:414
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:103
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:418
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:57
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:59
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:71
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:72
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:159
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your configuration"
+#: admin/systems/class_faiLogView.inc:163
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:176
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:219
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:227
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -334,99 +390,199 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:163
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:167
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:172
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:308
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:379
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:382
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:414
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
+#: admin/fai/class_faiPackage.inc:418
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: admin/fai/class_faiPackage.inc:422
+msgid "Install method"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:422
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:433
+msgid "Packages"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:437
+msgid "Packages in this class"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your configuration"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -454,6 +610,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -696,24 +879,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -736,237 +931,32 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:65
-msgid "Full automated installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:83
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:87
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:91
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:95
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:95
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:103
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Is this mirror an installation repository? Is its release a custom one?"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:178
-msgid "Repositories this server hosts"
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
-msgstr ""
-
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
-msgstr ""
-
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr ""
-
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
-msgstr ""
-
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
+#: admin/fai/packageSelect/selectPackage-list.xml:11
+msgid "Please select the desired entries"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
diff --git a/fai/locale/es/fusiondirectory.po b/fai/locale/es/fusiondirectory.po
index 24d5d5ed81d811207c9246ba2dedd01ab9797454..625b748062f3e2bf1fa72107e4dc59a64b5d2c1d 100644
--- a/fai/locale/es/fusiondirectory.po
+++ b/fai/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 17:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Versión"
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "Secciones"
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -227,53 +226,53 @@ msgstr "Directorio de rgistros"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Archivo"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Fecha"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Registros disponibles"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Seleccionar registro"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr "Tabla de particiones FAI"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr "Acceso"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paquete"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "Lista de paquetes FAI"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Método de instalación"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Paquetes"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr "Dispositivo"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nombre"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
@@ -969,11 +968,3 @@ msgstr "Filtro"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Un máximo de 200 entradas serán enseñadas."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Actualizar"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Enviar"
diff --git a/fai/locale/es_CO/fusiondirectory.po b/fai/locale/es_CO/fusiondirectory.po
index d2aeaa19cb817a17be8eaf9a6662f53dac1ffb10..ea538ff5b74e52b1b009083d0ac922ee780871cb 100644
--- a/fai/locale/es_CO/fusiondirectory.po
+++ b/fai/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr "Ordenar de modo inverso"
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr "Ordenar"
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Archivo"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nombre"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Por favor elija las entradas que desea"
 
@@ -969,11 +968,3 @@ msgstr "Filtro"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Enviar"
diff --git a/fai/locale/es_VE/fusiondirectory.po b/fai/locale/es_VE/fusiondirectory.po
index 6b1259bdc83b4499fddc293a966d77437c291099..8cce1fc70ac5b373745448fc98490f81e321d545 100644
--- a/fai/locale/es_VE/fusiondirectory.po
+++ b/fai/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Versión"
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "Secciones"
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
@@ -227,53 +226,53 @@ msgstr "Directorio de rgistros"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Archivo"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Fecha"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Registros disponibles"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Seleccionar registro"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr "Tabla de particiones FAI"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr "Acceso"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paquete"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "Lista de paquetes FAI"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Método de instalación"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Paquetes"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr "Dispositivo"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nombre"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
@@ -969,11 +968,3 @@ msgstr "Filtro"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Un máximo de 200 entradas serán enseñadas."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Actualizar"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Enviar"
diff --git a/fai/locale/fa_IR/fusiondirectory.po b/fai/locale/fa_IR/fusiondirectory.po
index 7d9c4db504cff2540a52efd20ce6d20685f0e559..7524815a00982c09339d332b6eac2abc9a375728 100644
--- a/fai/locale/fa_IR/fusiondirectory.po
+++ b/fai/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "خطا"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr ""
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/fi_FI/fusiondirectory.po b/fai/locale/fi_FI/fusiondirectory.po
index a09c88bde8e8655abd6d7c182be1244238a52b22..5c34d8b84efcf3fc110bbccd6de1af57b68545de 100644
--- a/fai/locale/fi_FI/fusiondirectory.po
+++ b/fai/locale/fi_FI/fusiondirectory.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-14 18:38+0000\n"
-"Last-Translator: Dina Solveig Jalkanen\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -69,7 +68,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -85,7 +84,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -114,7 +113,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -184,7 +183,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
@@ -229,53 +228,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -298,7 +297,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -306,7 +305,7 @@ msgid "Properties"
 msgstr "Ominaisuudet"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -317,7 +316,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -327,7 +326,7 @@ msgid "Description"
 msgstr "Kuvaus"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -394,67 +393,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr "Merkitse asennettavaksi"
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr "Merkitse poistettavaksi"
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr "Muokkaa asetuksia"
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Asennustapa"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -494,7 +494,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nimi"
 
@@ -956,7 +955,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -971,11 +970,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/fr/fusiondirectory.po b/fai/locale/fr/fusiondirectory.po
index 7e12e5ac808ac9619b4a50e0ae4ec3fe3cb4aef2..359e04f0b9dc87a1b66416b841733dd05c7dc91d 100644
--- a/fai/locale/fr/fusiondirectory.po
+++ b/fai/locale/fr/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,6 @@ msgstr "Configuration du plugin FAI"
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -68,7 +67,7 @@ msgstr "Profil FAI et version de Debian à appliquer pour ce système"
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Version"
 
@@ -84,7 +83,7 @@ msgstr "Profil"
 msgid "FAI profil to be applied to this computer"
 msgstr "Profil FAI à appliquer pour ce système"
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Dépôt"
 
@@ -113,7 +112,7 @@ msgid "Release used on this repository"
 msgstr "Version utilisée sur ce dépôt"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "Sections"
 
@@ -183,7 +182,7 @@ msgstr "Dépôts fournis par ce serveur"
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -228,53 +227,53 @@ msgstr "Répertoire des journaux systèmes"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr "Répertoire contenant les journaux systèmes de argonaut-fai-monitor"
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr "Tri décroissant"
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr "Tri croissant"
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Fichier"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Date"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Journaux systèmes disponibles"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Journal système séléctionné"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr "Contenu du journal système sélectionné"
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr "Journaux systèmes FAI"
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr "Afficheur de journaux systèmes FAI"
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr "Fichier sélectionné"
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr "Fichier sélectionné : %s"
@@ -297,7 +296,7 @@ msgid "FAI partition table"
 msgstr "Table des partitions FAI"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -305,7 +304,7 @@ msgid "Properties"
 msgstr "Propriétés"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -316,7 +315,7 @@ msgid "Partition table class name"
 msgstr "Nom de la classe de partition"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -326,7 +325,7 @@ msgid "Description"
 msgstr "Description"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -393,67 +392,68 @@ msgstr "Accès"
 msgid "Access rights"
 msgstr "Droits d'accès"
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr "Marquer à installer"
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr "Marquer à enlever"
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr "Éditer la configuration"
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr "Service d’infrastructure"
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr "Paquets inconnus"
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paquet"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "Liste de paquets FAI"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr "Paquet FAI"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Nom de la classe variables"
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr "La version de Debian concernée"
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr "Les sections concernées"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Méthode d'installation"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr "La méthode d'installation à utiliser pour cette liste de paquets"
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Paquets"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr "Paquets dans cette classe"
 
@@ -493,7 +493,6 @@ msgstr "Périphérique"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nom"
 
@@ -955,7 +954,7 @@ msgstr "Priorité de ce script (la plus petite vient en premier)"
 msgid "The script itself"
 msgstr "Le script en lui même"
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Veuillez sélectionner les entrées désirées"
 
@@ -970,11 +969,3 @@ msgstr "Filtre"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Un maximum de 200 entrées seront montrées ici."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Mise à jour"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Soumettre"
diff --git a/fai/locale/hu_HU/fusiondirectory.po b/fai/locale/hu_HU/fusiondirectory.po
index 4b3c7bc42ae185aa5c36694bde3edce6ec00a12d..d2dfe2529c50ab6f585c3eab7d078ad4e291dad1 100644
--- a/fai/locale/hu_HU/fusiondirectory.po
+++ b/fai/locale/hu_HU/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:42+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr ""
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Leírás"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Név"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/id/fusiondirectory.po b/fai/locale/id/fusiondirectory.po
index b3db109fc8204163da3904e8a41947e3d1cc3bfa..399b9da9d85cb57d765ddf5f462a14943e754191 100644
--- a/fai/locale/id/fusiondirectory.po
+++ b/fai/locale/id/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:42+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr ""
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr ""
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/it_IT/fusiondirectory.po b/fai/locale/it_IT/fusiondirectory.po
index 4496c5e1181a0ba56a7f34a420f9154cb4cf4589..4ba745d2bc25ef412ba1f7ee2fd50a925550d2b6 100644
--- a/fai/locale/it_IT/fusiondirectory.po
+++ b/fai/locale/it_IT/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:23+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,6 @@ msgstr "Configurazione del plugin FAI di FusionDirectory"
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -68,7 +67,7 @@ msgstr "Profilo e Release FAI da applicare a questo computer"
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Versione"
 
@@ -84,7 +83,7 @@ msgstr "Profilo"
 msgid "FAI profil to be applied to this computer"
 msgstr "Profilo FAI da applicare a questo computer"
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Deposito"
 
@@ -113,7 +112,7 @@ msgid "Release used on this repository"
 msgstr "Release utilizzata in questo repository"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "Sezioni"
 
@@ -183,7 +182,7 @@ msgstr "Repository che questo server ospita"
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
@@ -228,53 +227,53 @@ msgstr "Cartella degli errori"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr "Directory nel quale argonaut-fai-monitor immagazzinerà i propri log"
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr "Ordina in modo decrescente"
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr "Ordina in modo crescente"
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "File"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Data"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Logs di sistema disponibili"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Logs di sistema selezionato"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr "Contenuto del log selezionato"
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr "Connessioni FAI"
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr "Connessioni FAI"
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Errore"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr "File selezionato"
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr "File selezionato: %s "
@@ -297,7 +296,7 @@ msgid "FAI partition table"
 msgstr "Tavola delle partizioni FAI"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -305,7 +304,7 @@ msgid "Properties"
 msgstr "Proprietà"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -316,7 +315,7 @@ msgid "Partition table class name"
 msgstr "Nome della tavola delle partizioni"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -326,7 +325,7 @@ msgid "Description"
 msgstr "Descrizione"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -393,67 +392,68 @@ msgstr "Accesso"
 msgid "Access rights"
 msgstr "Opzioni di accesso"
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr "Marca per l'installazione"
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr "Marca per la rimozione"
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr "Modifica configurazione"
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr "Servizio d'infrastruttura"
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr "Pacchetti sconosciuti"
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Pacchetto"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "Elenco dei pacchetti FAI"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr "Pacchetto FAI"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Nome di classe variabile"
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr "Versione Debian da installare"
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr "Sezioni interessate"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Metodo d'installazione"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr "Installa metodo da utilizzare per questa lista di pacchetti"
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Pacchetti"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr "Pacchetti in questa classe"
 
@@ -493,7 +493,6 @@ msgstr "Dispositivi"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nome"
 
@@ -955,7 +954,7 @@ msgstr "Priorità di questo script (i più piccoli saranno i primi)"
 msgid "The script itself"
 msgstr "Lo script stesso"
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Seleziona le entries desiderate"
 
@@ -970,11 +969,3 @@ msgstr "Filtro"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Saranno mostrate un massimo di 200 entries."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Aggiornamento"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Invia"
diff --git a/fai/locale/lv/fusiondirectory.po b/fai/locale/lv/fusiondirectory.po
index 6feb592e53bfb5601720223d0004e39fb956caf1..f77166886ca7ecb56eea5f9a628756f859e6d257 100644
--- a/fai/locale/lv/fusiondirectory.po
+++ b/fai/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Krātuve "
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Kļūda"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Apraksts"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Vārds "
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr "Filtrs"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/nb/fusiondirectory.po b/fai/locale/nb/fusiondirectory.po
index 07f204fb8301b13f519f65c38143fae4a6d93f15..cc4ced70f0aafa92462830ba4f79f75785c4fb9c 100644
--- a/fai/locale/nb/fusiondirectory.po
+++ b/fai/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Feil"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Egenskaper"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Navn"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr "Filter"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/nl/fusiondirectory.po b/fai/locale/nl/fusiondirectory.po
index af3ed0d6cd4b18cd0c6fef3fc732c22f6c2903a3..5729992ea107fcd8dbd56958e4fc3ca85f212c3f 100644
--- a/fai/locale/nl/fusiondirectory.po
+++ b/fai/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr "FAI profiel en release om toe te passen op deze computer"
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Distributie versie"
 
@@ -83,7 +82,7 @@ msgstr "Profiel"
 msgid "FAI profil to be applied to this computer"
 msgstr "FAI profiel om toe te passen op deze computer"
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Verzamelplaats"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "Secties"
 
@@ -182,7 +181,7 @@ msgstr "Repositories op deze server"
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -227,53 +226,53 @@ msgstr "Log map"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Bestand"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Datum"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Beschikbare logs"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Geselecteerde log"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Fout"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr "FAI partitie tafel"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Eigenschappen"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr "Toegang"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr "Onbekende pakketen"
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Pakket"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "FAI pakket lijst"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr "FAI pakket"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Installatie methode"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Pakketten"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr "Apparaat"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Naam"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Gelieve de gegevens te selecteren"
 
@@ -969,11 +968,3 @@ msgstr "Filter"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Een maximum van 200 gegevens worden hier getoond."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Bijwerken"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Verwerk"
diff --git a/fai/locale/pl/fusiondirectory.po b/fai/locale/pl/fusiondirectory.po
index 93c8b056833f9385ed1195017bbfa28546254084..3674b07f1eea7c6e424dffdf6dce955ef25f92f9 100644
--- a/fai/locale/pl/fusiondirectory.po
+++ b/fai/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Wersja"
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Repozytorium"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Plik"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Data"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr "Tablica partycji FAI"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Właściwości"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Opis"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr "Dostęp"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Pakiet"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "Lista pakietów FAI"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Metoda instalacji"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Pakiety"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr "UrzÄ…dzenie"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "ImiÄ™"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr "Filtr"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Aktualizuj"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Wyślij"
diff --git a/fai/locale/pt/fusiondirectory.po b/fai/locale/pt/fusiondirectory.po
index b437288d8d519938bee10899ba030a47e551819e..7419dae5abaa950f4e8add38b61a68226c64d439 100644
--- a/fai/locale/pt/fusiondirectory.po
+++ b/fai/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Erro"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Propriedades"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nome"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Submeter"
diff --git a/fai/locale/pt_BR/fusiondirectory.po b/fai/locale/pt_BR/fusiondirectory.po
index c0caada5c4319defaedd95061f93671725d61ca9..71d89af6868da27d5875cc4b477bc1782e6b69a5 100644
--- a/fai/locale/pt_BR/fusiondirectory.po
+++ b/fai/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Liberação"
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Repositório"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -227,53 +226,53 @@ msgstr "Diretório de registro"
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Arquivo"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Data"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr "Registros disponíveis"
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr "Selecionar registro"
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Erro"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr "Tabela de partição FAI"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Propriedades"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr "Pacotes desconhecidos"
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Pacote"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "Lista de pacotes FAI"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr "Pacote FAI"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Pacotes"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr "Dispositivo"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nome"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Por favor, selecione as entradas desejadas"
 
@@ -969,11 +968,3 @@ msgstr "Filtro"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Atualizar"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/ru/fusiondirectory.po b/fai/locale/ru/fusiondirectory.po
index e65ac4cd017161c1e0f083aa93fb39f8fd9562a8..7107299205457e8f013ea21f6f490748d8b87673 100644
--- a/fai/locale/ru/fusiondirectory.po
+++ b/fai/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-08 09:58+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr "Сортировать по убыванию"
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr "Сортировать по возврастанию"
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Файл"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "Дата"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Ошибка"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Свойства"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Описание"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Фамилия"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Пожалуйста выберете нужные записи"
 
@@ -969,11 +968,3 @@ msgstr "Фильтр"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Обновить"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Отправить"
diff --git a/fai/locale/ru@petr1708/fusiondirectory.po b/fai/locale/ru@petr1708/fusiondirectory.po
index e55c686e3056d3a49ad843a9a4b3723c1829c398..07dd84c6700457ccd6eb5df14bc048b87b8844e5 100644
--- a/fai/locale/ru@petr1708/fusiondirectory.po
+++ b/fai/locale/ru@petr1708/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:42+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr ""
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr ""
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/sv/fusiondirectory.po b/fai/locale/sv/fusiondirectory.po
index 485823b185466aef50ac0c9017eb51ba827ac3a5..b220b01bbc5ea68e7f9c8e1226fd39db56a7a23f 100644
--- a/fai/locale/sv/fusiondirectory.po
+++ b/fai/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr "FusionDirectorys fai-plugin-konfiguration"
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "FAI"
 
@@ -67,7 +66,7 @@ msgstr "FAI-profil och release att applicera på den här datorn"
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "Release"
 
@@ -83,7 +82,7 @@ msgstr "Profil"
 msgid "FAI profil to be applied to this computer"
 msgstr "FAI-profil att applicera på den här datorn"
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "Förråd"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr "Sektioner"
 
@@ -182,7 +181,7 @@ msgstr "Förråd denna server tillhandahåller"
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "Fil"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Fel"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr "FAI-partitionstabell"
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Egenskaper"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr "Tillgång"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr "Okända paket"
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paket"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr "FAI-paketlista"
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr "FAI-paket"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "Installationsmetod"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "Paket"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr "Enhet"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Namn"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Välj önskade poster"
 
@@ -969,11 +968,3 @@ msgstr "Filter"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Maximalt 200 poster kommer att visas här."
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Uppdatera"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Skicka"
diff --git a/fai/locale/ug/fusiondirectory.po b/fai/locale/ug/fusiondirectory.po
index fd65bd4ee5daa2417b472263a0a9bac83efa5c21..d8cf728f73e3c01bbcbfcf08dee1e3cd86c0160e 100644
--- a/fai/locale/ug/fusiondirectory.po
+++ b/fai/locale/ug/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:42+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr ""
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr ""
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr ""
diff --git a/fai/locale/vi_VN/fusiondirectory.po b/fai/locale/vi_VN/fusiondirectory.po
index c969f8109f1d472a42c2f80cb4b5b812925395e5..c3c6d403509ca8b92b479675d9df764f66644709 100644
--- a/fai/locale/vi_VN/fusiondirectory.po
+++ b/fai/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr ""
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr ""
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "File"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "Properties"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "Mô tả"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr ""
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Tên"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Ná»™p"
diff --git a/fai/locale/zh/fusiondirectory.po b/fai/locale/zh/fusiondirectory.po
index 7a1f784cf49a9116fe4cd29733b808318ad353fd..f99b4820daaa9658f7b045152610620f06815d4d 100644
--- a/fai/locale/zh/fusiondirectory.po
+++ b/fai/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
-#: admin/fai/packageSelect/selectPackage-list.xml:14
 msgid "FAI"
 msgstr "自动化安装"
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Release"
 msgstr "发行"
 
@@ -83,7 +82,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
 msgid "Repository"
 msgstr "仓库"
 
@@ -112,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections"
 msgstr ""
 
@@ -182,7 +181,7 @@ msgstr ""
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+#: admin/fai/class_faiPackage.inc:253 admin/fai/class_faiTemplate.inc:114
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
@@ -227,53 +226,53 @@ msgstr ""
 msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
+#: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
+#: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
+#: admin/systems/class_faiLogView.inc:71
 msgid "File"
 msgstr "文件"
 
-#: admin/systems/class_faiLogView.inc:71
+#: admin/systems/class_faiLogView.inc:72
 msgid "Date"
 msgstr "日期"
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
+#: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
+#: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
+#: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
+#: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
 msgid "Error"
 msgstr "错误"
 
-#: admin/systems/class_faiLogView.inc:218
+#: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
+#: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
 msgstr ""
@@ -296,7 +295,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:398
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
@@ -304,7 +303,7 @@ msgid "Properties"
 msgstr "属性"
 
 #: admin/fai/class_faiPartitionTable.inc:306
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
@@ -315,7 +314,7 @@ msgid "Partition table class name"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:405
 #: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
 #: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
@@ -325,7 +324,7 @@ msgid "Description"
 msgstr "描述"
 
 #: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiPackage.inc:405 admin/fai/class_faiHook.inc:55
 #: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 msgid "Short description of the class"
@@ -392,67 +391,68 @@ msgstr "访问"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
+#: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
+#: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
+#: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackage.inc:289
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
+#: admin/fai/class_faiPackage.inc:308
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
+#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "软件包"
 
-#: admin/fai/class_faiPackage.inc:377
+#: admin/fai/class_faiPackage.inc:379
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
+#: admin/fai/class_faiPackage.inc:382
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
+#: admin/fai/class_faiPackage.inc:414
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
+#: admin/fai/class_faiPackage.inc:418
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method"
 msgstr "安装方法"
 
-#: admin/fai/class_faiPackage.inc:420
+#: admin/fai/class_faiPackage.inc:422
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
+#: admin/fai/class_faiPackage.inc:433
 msgid "Packages"
 msgstr "软件包"
 
-#: admin/fai/class_faiPackage.inc:435
+#: admin/fai/class_faiPackage.inc:437
 msgid "Packages in this class"
 msgstr ""
 
@@ -492,7 +492,6 @@ msgstr "设备"
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiScript.inc:71
 #: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "名称"
 
@@ -954,7 +953,7 @@ msgstr ""
 msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
+#: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -969,11 +968,3 @@ msgstr "过滤器"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "æ›´æ–°"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "提交"
diff --git a/freeradius/admin/freeradius/class_freeradiusGroup.inc b/freeradius/admin/freeradius/class_freeradiusGroup.inc
index 69bf15c27fd3628e013edf7c50d3e5c2146b1fd6..fc1d9fc7b64ba42bd5a1bc0ef58374d8dd2825ba 100644
--- a/freeradius/admin/freeradius/class_freeradiusGroup.inc
+++ b/freeradius/admin/freeradius/class_freeradiusGroup.inc
@@ -34,7 +34,7 @@ class freeradiusGroup extends simplePlugin {
       'plShortName'       => _('Freeradius'),
       'plDescription'     => _('This Plugin is for Radius accounting based in FreeRadius'),
       'plObjectType'      => array('group'),
-      'plProvidedAcls'    => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'    => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/freeradius/locale/ar/fusiondirectory.po b/freeradius/locale/ar/fusiondirectory.po
index 45940818fa123b5dbd34dc3bceac57dcd2c01fe9..ae81d62f175275220961b14de0f5b0bceb8f4670 100644
--- a/freeradius/locale/ar/fusiondirectory.po
+++ b/freeradius/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/ca/fusiondirectory.po b/freeradius/locale/ca/fusiondirectory.po
index c5e7ba1eb75e5f1defa3291ebb653ffd9c2dff0b..f930c75984285edeb64021d0a29ea6038169e5c9 100644
--- a/freeradius/locale/ca/fusiondirectory.po
+++ b/freeradius/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/cs_CZ/fusiondirectory.po b/freeradius/locale/cs_CZ/fusiondirectory.po
index 8fdf7215bc139b726366b49349a8b74b8102991a..1047108a3ecb2b033bb617c9025ba084d46a7686 100644
--- a/freeradius/locale/cs_CZ/fusiondirectory.po
+++ b/freeradius/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -27,94 +27,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Tento zásuvný modul slouží pro správu ověřování Radius, založeném na implementaci FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr "Podpora 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr "Typ média tunelu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr "Název typu média tunelu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr "Typ tunelu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr "Název typu tunelu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr "Identifikátor virtuální sítě (vlan)"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr "Identifikátor virt. sítě (vlan)"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Datum skončení platnosti"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr "Datum skončení platnosti účtu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Skupiny"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr "FreeRadius skupina"
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr "Předvolby uživatele"
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr "Protokol"
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr "Maska IP sítě"
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr "Komprese"
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr "Typ služby"
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr "Časový limit relace"
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr "Časový limit nečinnosti"
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr "Omezení portů"
diff --git a/freeradius/locale/de/fusiondirectory.po b/freeradius/locale/de/fusiondirectory.po
index 8f6c243b2f7a92f0a006abf79095e8592e42873d..5dd9d6e1a244e1967a2ae4a68ff2ca7aa4ba1c01 100644
--- a/freeradius/locale/de/fusiondirectory.po
+++ b/freeradius/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -27,94 +27,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Dieses Plugin dient für Radiusaufzeichungen basierend auf FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr "Unterstützung von 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr "Art des Tunnelmediums"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr "Name der Tunnelmediumart"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr "Tunelart"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr "Name der Tunnelart"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr "VLAN identifier"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr "Datum des Kontenablaufs"
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Gruppen"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr "FreeRadius Gruppe"
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr "Benutzerpräferenzen"
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr "IP Addresse"
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr "IP Netmaske"
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr "Framed-MTU"
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr "Kompression"
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr "Dienst-Art"
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr "Session Timeout"
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr "Idle Timeout"
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr "Port Limit"
diff --git a/freeradius/locale/el_GR/fusiondirectory.po b/freeradius/locale/el_GR/fusiondirectory.po
index 39aa7ffd4f42d38284f19938cea7585668f5b8e1..fff7f395c6fb6dafdce8057d6f01f1215912cc48 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -28,94 +28,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Αυτό το πρόσθετο είναι για το Radius accounting based in FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr "Υποστήριξη 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr "Είδος μέσου Tunnel "
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr "Όνομα του είδους μέσου Tunnel "
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr "Τύπος Tunnel "
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr "Όνομα του tunnel type"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr "Αναγνωριστικό VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Ημερομηνία λήξης"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr "Ημερομηνία λήξης του λογαριασμού"
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr "Ομάδα FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr "Προτιμήσεις χρήστη"
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr "Διεύθυνση IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr "Μάσκα δικτύου "
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr "Framed-MTU"
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr "Συμπίεση"
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr "Τύπος υπηρεσίας"
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr "Όριο χρόνου συνεδρίας"
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr "Χρόνος αδράνειας"
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr "Όριο θύρας"
diff --git a/freeradius/locale/en/fusiondirectory.po b/freeradius/locale/en/fusiondirectory.po
index 70ea572e445059c1c54fe98de41e5856b5df2073..c96b40363e70b89e42b0a675c581d0abd6f4299b 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,104 +17,104 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
-#: personal/freeradius/class_freeradiusAccount.inc:55
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
-#: personal/freeradius/class_freeradiusAccount.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
-#: personal/freeradius/class_freeradiusAccount.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
-#: personal/freeradius/class_freeradiusAccount.inc:63
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
-#: personal/freeradius/class_freeradiusAccount.inc:63
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
-#: personal/freeradius/class_freeradiusAccount.inc:68
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
-#: personal/freeradius/class_freeradiusAccount.inc:68
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/es/fusiondirectory.po b/freeradius/locale/es/fusiondirectory.po
index a6341a98f49e2efabc9923544bd6e2668337e0e9..0db6e8707cc6243e9f770888f774f5113c1003c8 100644
--- a/freeradius/locale/es/fusiondirectory.po
+++ b/freeradius/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/es_CO/fusiondirectory.po b/freeradius/locale/es_CO/fusiondirectory.po
index 62feb57ae813be9f6a826a0a54fdb8cc2036bd66..dfb492d1eb300e3bfde18d8cfd9476908805651e 100644
--- a/freeradius/locale/es_CO/fusiondirectory.po
+++ b/freeradius/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/es_VE/fusiondirectory.po b/freeradius/locale/es_VE/fusiondirectory.po
index eac687a405356a18a5837f2dcebb236c59a41356..c10b2fbeb2560e6b132ac53a343ca5ff9560f764 100644
--- a/freeradius/locale/es_VE/fusiondirectory.po
+++ b/freeradius/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/fa_IR/fusiondirectory.po b/freeradius/locale/fa_IR/fusiondirectory.po
index cd260dbcf96d06606c72c8b5d7f920bbb60f7171..ed4b038a7bfcf635aefcc7ec9da1a4b5aac8bc6c 100644
--- a/freeradius/locale/fa_IR/fusiondirectory.po
+++ b/freeradius/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/fi_FI/fusiondirectory.po b/freeradius/locale/fi_FI/fusiondirectory.po
index 5be620895c4265e3a93d761fa7f1f752ef18d649..bda72913c42335a339afa42cf47e092ed12df0a5 100644
--- a/freeradius/locale/fi_FI/fusiondirectory.po
+++ b/freeradius/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Eräpäivä"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/fr/fusiondirectory.po b/freeradius/locale/fr/fusiondirectory.po
index 961482478b173b190c992b636152d7390b9b37b7..8e2fc9997008211954f91d5062c9ef25d55c8731 100644
--- a/freeradius/locale/fr/fusiondirectory.po
+++ b/freeradius/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -28,94 +28,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Ce plugin est pour la comptabilité Radius basé sur FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr "Supporter 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr "Type de média pour le tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr "Nom du type de média pour le tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr "Type de tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr "Nom du type de tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr "ID du Vlan"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr "Identifiant du Vlan"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr "Date d'expiration du compte"
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Groupes"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr "Groupe Freeradius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr "Préférences utilisateurs"
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr "Protocole"
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr "Masque de réseau"
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr "Framed-MTU"
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr "Compression"
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr "Type de service"
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr "Délai d'inactivité"
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr "Délai d'inactivité sans trafic"
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr "Limite du port"
diff --git a/freeradius/locale/hu_HU/fusiondirectory.po b/freeradius/locale/hu_HU/fusiondirectory.po
index 798b8e92f0d5aed0b087b21d0b3bbb939cf0c81a..16d959a48d2979c33469d8f125603ea45d19444e 100644
--- a/freeradius/locale/hu_HU/fusiondirectory.po
+++ b/freeradius/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/id/fusiondirectory.po b/freeradius/locale/id/fusiondirectory.po
index b5859852efc2d369a1962086cc7bde5133180a23..461b16113e19aff02c913b3647f37f7b14744a2f 100644
--- a/freeradius/locale/id/fusiondirectory.po
+++ b/freeradius/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/it_IT/fusiondirectory.po b/freeradius/locale/it_IT/fusiondirectory.po
index 46498cc5e154124a71ae393f8f0e0b19a08a51c2..bdbf66c247cd6e01ede7a7a742379cda84fdb89a 100644
--- a/freeradius/locale/it_IT/fusiondirectory.po
+++ b/freeradius/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -29,94 +29,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Questo plugin è per l'accounting RADIUS basato su FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr "Supporto 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr "Tunnel di tipo medio"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr "Nome del tunnel di tipo medio"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr "Tipo di tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr "Nome del tipo di tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr "ID della VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr "Identificatore della VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr "Data di scadenza dell'account"
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Gruppi"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr "Gruppo FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr "Preferenze dell'utente"
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr "Maschera di rete"
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr "Framed-MTU"
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr "Compressione"
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr "Tipo di servizio"
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr "Scadenza della sessione"
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr "Tempo d'inattività"
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr "limite porta"
diff --git a/freeradius/locale/lv/fusiondirectory.po b/freeradius/locale/lv/fusiondirectory.po
index 69169871e942d7725e28f7ee14f85c905c1c5e15..4ea01069b1cbc19b6dcf7a43f61e1f9d28d69755 100644
--- a/freeradius/locale/lv/fusiondirectory.po
+++ b/freeradius/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Derīguma termiņš"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/nb/fusiondirectory.po b/freeradius/locale/nb/fusiondirectory.po
index 55b8ab03cf7a207bfbb09cecbcf424125f540a9c..e4d60c711c6a506789d52fb159d7d88c1b87e277 100644
--- a/freeradius/locale/nb/fusiondirectory.po
+++ b/freeradius/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/nl/fusiondirectory.po b/freeradius/locale/nl/fusiondirectory.po
index b433e7202831612cac0cb8a5928a14f4e71b8edc..4b6bfdd2903f39b4883010c970879903a916dfab 100644
--- a/freeradius/locale/nl/fusiondirectory.po
+++ b/freeradius/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -27,94 +27,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Deze plugin is voor Radius accouting gebaseerd in Freeradius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Groepen"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/pl/fusiondirectory.po b/freeradius/locale/pl/fusiondirectory.po
index cfbfdb869980b8b5557a3bc5bca50da19aca8ea1..35eab25d1d8c4a59de9bb8b74ad242a077865ea1 100644
--- a/freeradius/locale/pl/fusiondirectory.po
+++ b/freeradius/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Grupy"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/pt/fusiondirectory.po b/freeradius/locale/pt/fusiondirectory.po
index e4d378f2eb2c5cbdb0a9ec1ff3b9467e0ed149f5..cc3b19fdbf9b809fabf31931bdaf1d7e16dd6ada 100644
--- a/freeradius/locale/pt/fusiondirectory.po
+++ b/freeradius/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/pt_BR/fusiondirectory.po b/freeradius/locale/pt_BR/fusiondirectory.po
index c15206bdc98d5507fbc973040360f8c5b3278f81..0934408f915fa22a79d96db607c7b13091e5a5b8 100644
--- a/freeradius/locale/pt_BR/fusiondirectory.po
+++ b/freeradius/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -27,94 +27,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Este Plugin é para uma conta Radius baseado em FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr "Tipo de túnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr "Nome do tipo de túnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr "id de VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr "Indentificador da VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr "Data de expiração da conta"
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr "Grupo FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr "Preferências de usuários"
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr "IP de máscara de rede"
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr "Compressão"
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr "Tipo de serviço"
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr "Tempo limite de sessão esgotado"
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/ru/fusiondirectory.po b/freeradius/locale/ru/fusiondirectory.po
index 0bdc6ba98f988a10c8c66d1c22774c38f1c1fc89..c76740dd519e60cf9514c0008e51e3f597251028 100644
--- a/freeradius/locale/ru/fusiondirectory.po
+++ b/freeradius/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -28,94 +28,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr "Поддержка 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr "Тип туннеля"
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr "Название типа туннеля"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr "Идентификатор VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Дата окончания действия"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Группы"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr "Протокол"
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr "IP адрес"
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr "сетевая маска IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr "Сжатие"
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/ru@petr1708/fusiondirectory.po b/freeradius/locale/ru@petr1708/fusiondirectory.po
index 112fef1262ca2f451ee3c8361a84f4066a753e7b..2105d145c01a478ea2613bd21f6394c5d8caae01 100644
--- a/freeradius/locale/ru@petr1708/fusiondirectory.po
+++ b/freeradius/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/sv/fusiondirectory.po b/freeradius/locale/sv/fusiondirectory.po
index f30d61723a8cefbd5c39cdd0990ff2facf7947a8..637b517c4b1707a31126c587c59c5948c4166b12 100644
--- a/freeradius/locale/sv/fusiondirectory.po
+++ b/freeradius/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr "Utgångsdatum"
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Grupper"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/ug/fusiondirectory.po b/freeradius/locale/ug/fusiondirectory.po
index 9665dd61a9017afa2ea6410e03655684e8aac9b3..66dbd86829006ed2437e0e6884e3c11880c3cab3 100644
--- a/freeradius/locale/ug/fusiondirectory.po
+++ b/freeradius/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/vi_VN/fusiondirectory.po b/freeradius/locale/vi_VN/fusiondirectory.po
index e47dd03b5dd88970e8244ebe8f3457cdb83cf40b..4d2ea84acffda303119480f673a30c178bee13a0 100644
--- a/freeradius/locale/vi_VN/fusiondirectory.po
+++ b/freeradius/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "Các nhóm"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/zh/fusiondirectory.po b/freeradius/locale/zh/fusiondirectory.po
index fb56b033773c9c03dc556d77b5a8d2ae2a5485c8..6b16f1edd236a4588bf4833d63eca02cafe35d7d 100644
--- a/freeradius/locale/zh/fusiondirectory.po
+++ b/freeradius/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:55
-#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:54
+#: admin/freeradius/class_freeradiusGroup.inc:48
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:51
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:58
-#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:57
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:58
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:63
-#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:62
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:65
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:68
-#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:67
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:73
+#: personal/freeradius/class_freeradiusAccount.inc:72
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:80
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:79
+#: personal/freeradius/class_freeradiusAccount.inc:83
 msgid "Groups"
 msgstr "用户组"
 
-#: personal/freeradius/class_freeradiusAccount.inc:85
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:94
+#: personal/freeradius/class_freeradiusAccount.inc:93
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:97
+#: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:102
+#: personal/freeradius/class_freeradiusAccount.inc:101
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:107
+#: personal/freeradius/class_freeradiusAccount.inc:106
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:112
+#: personal/freeradius/class_freeradiusAccount.inc:111
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:119
+#: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:124
+#: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:129
+#: personal/freeradius/class_freeradiusAccount.inc:128
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:136
+#: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:143
+#: personal/freeradius/class_freeradiusAccount.inc:142
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/personal/freeradius/class_freeradiusAccount.inc b/freeradius/personal/freeradius/class_freeradiusAccount.inc
index 20f081a4ec5491ccb4e47078f57ce2b3521e79cd..45fb7fabea834f289f1fe5b9f6af965cde6788be 100644
--- a/freeradius/personal/freeradius/class_freeradiusAccount.inc
+++ b/freeradius/personal/freeradius/class_freeradiusAccount.inc
@@ -40,7 +40,7 @@ class freeradiusAccount extends simplePlugin {
       'plPriority'    => 11,
       'plObjectType'  => array('user'),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc b/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
index 87bfbfa1738e68205a1b67fc5c8be73a51267478..da9ffb36ae753ceac0abca7ad2999b82c7b8da70 100644
--- a/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
+++ b/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
@@ -60,7 +60,7 @@ class fiInventory extends simplePlugin
     'licenseinfos'    => 'software',
   );
 
-  /* Return plugin informations */
+  /* Return plugin information */
   static function plInfo()
   {
     return array(
@@ -80,7 +80,7 @@ class fiInventory extends simplePlugin
         )
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -117,7 +117,7 @@ class fiInventory extends simplePlugin
   function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
   {
     global $config;
-    $attributesInfo = self::getAttributesInfo();
+    $attributesInfo = static::getAttributesInfo();
     if (preg_match('/'.preg_quote(get_ou('inventoryRDN').$config->current['BASE'], '/').'$/', $dn)) {
       $this->mainTab        = TRUE;
       $this->objectclasses  = array('fdInventoryContent');
@@ -238,15 +238,15 @@ class fiInventory extends simplePlugin
         continue;
       }
 
-      if (!isset($infos[self::$sections[$class]][$class])) {
-        $infos[self::$sections[$class]][$class] = array('keys' => array(), 'objects' => array());
+      if (!isset($infos[static::$sections[$class]][$class])) {
+        $infos[static::$sections[$class]][$class] = array('keys' => array(), 'objects' => array());
       }
-      $infos[self::$sections[$class]][$class]['keys'] =
+      $infos[static::$sections[$class]][$class]['keys'] =
         array_unique(array_merge(
-          $infos[self::$sections[$class]][$class]['keys'],
+          $infos[static::$sections[$class]][$class]['keys'],
           array_keys($object)
         ));
-      $infos[self::$sections[$class]][$class]['objects'][$cn] = $object;
+      $infos[static::$sections[$class]][$class]['objects'][$cn] = $object;
     }
 
     return $infos;
diff --git a/fusioninventory/admin/systems/fusioninventory/class_fiInventoryAgent.inc b/fusioninventory/admin/systems/fusioninventory/class_fiInventoryAgent.inc
index feadcda28d2e7aa4021c10ffcf40ed6825906ac0..6bd9d9942a5efe7aba7c14968f5f45e5d759be2b 100644
--- a/fusioninventory/admin/systems/fusioninventory/class_fiInventoryAgent.inc
+++ b/fusioninventory/admin/systems/fusioninventory/class_fiInventoryAgent.inc
@@ -70,7 +70,7 @@ class fiInventoryAgent extends simplePlugin
     );
   }
 
-  /* Return plugin informations */
+  /* Return plugin information */
   static function plInfo()
   {
     return array(
@@ -79,7 +79,7 @@ class fiInventoryAgent extends simplePlugin
       'plPriority'    => 90,
       'plObjectType'  => array('winstation', 'workstation', 'server'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 }
diff --git a/fusioninventory/config/fusioninventory/class_fiConfig.inc b/fusioninventory/config/fusioninventory/class_fiConfig.inc
index 06d029ec43ec49f71f20a1fb03b9c294b4e7fd57..15a80872b26092d44da5ee22f1f89f4f7093cff6 100644
--- a/fusioninventory/config/fusioninventory/class_fiConfig.inc
+++ b/fusioninventory/config/fusioninventory/class_fiConfig.inc
@@ -30,7 +30,7 @@ class fiConfig extends simplePlugin
       "plCategory"      => array("configuration"),
       "plObjectType"    => array("smallConfig"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/fusioninventory/html/collect.php b/fusioninventory/html/collect.php
index b98e6facfb8e9c5b71c69fcd3afeac5e34a9c77a..9db8bd756aa2856041559f4e2d4e0d053a75c22a 100644
--- a/fusioninventory/html/collect.php
+++ b/fusioninventory/html/collect.php
@@ -19,15 +19,13 @@ if (strpos($http_raw_post_data, "<?xml") === 0) {
 } elseif ($xml = @gzinflate ("\x1f\x8b\x08\x00\x00\x00\x00\x00".$http_raw_post_data)) {
     /* OCS agent 2.0 Compatibility, but return in gzcompress */
     $compressmode = "gzdeflate";
-    if (strstr($xml, "<QUERY>PROLOG</QUERY>")
-            AND !strstr($xml, "<TOKEN>")) {
+    if (strstr($xml, "<QUERY>PROLOG</QUERY>") && !strstr($xml, "<TOKEN>")) {
         $compressmode = "gzcompress";
     }
 } elseif ($xml = @gzinflate (substr($http_raw_post_data, 2))) {
     /* OCS agent 2.0 Compatibility, but return in gzcompress */
     $compressmode = "gzdeflate";
-    if (strstr($xml, "<QUERY>PROLOG</QUERY>")
-            AND !strstr($xml, "<TOKEN>")) {
+    if (strstr($xml, "<QUERY>PROLOG</QUERY>") && !strstr($xml, "<TOKEN>")) {
         $compressmode = "gzcompress";
     }
 } else {
diff --git a/fusioninventory/locale/ar/fusiondirectory.po b/fusioninventory/locale/ar/fusiondirectory.po
index d07a1790a62f667bca7909ce082a86626ba9d5bf..70e197d58a6f17e989212346850ee33d343ed929 100644
--- a/fusioninventory/locale/ar/fusiondirectory.po
+++ b/fusioninventory/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/ca/fusiondirectory.po b/fusioninventory/locale/ca/fusiondirectory.po
index f36764b6367a447ea540c0e60ba894fb3741a536..3d97320ca9b38078117cd7be2bae98e1fa29a0ef 100644
--- a/fusioninventory/locale/ca/fusiondirectory.po
+++ b/fusioninventory/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
diff --git a/fusioninventory/locale/cs_CZ/fusiondirectory.po b/fusioninventory/locale/cs_CZ/fusiondirectory.po
index f8be47729cacff8add940d4af88f2129e4e2d922..841073743cc66fbd5714761064ffb696bc795172 100644
--- a/fusioninventory/locale/cs_CZ/fusiondirectory.po
+++ b/fusioninventory/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -62,7 +62,7 @@ msgstr "Obojí"
 msgid "IP or Mac address"
 msgstr "IP či MAC adresa"
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
diff --git a/fusioninventory/locale/de/fusiondirectory.po b/fusioninventory/locale/de/fusiondirectory.po
index 1ef6facd13abe47ef125a48fbd411ebf7f4449f1..6e9650609aa68287375e965655355567a499f423 100644
--- a/fusioninventory/locale/de/fusiondirectory.po
+++ b/fusioninventory/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -62,7 +62,7 @@ msgstr "Beide"
 msgid "IP or Mac address"
 msgstr "IP- oder MAC-Adresse"
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
diff --git a/fusioninventory/locale/el_GR/fusiondirectory.po b/fusioninventory/locale/el_GR/fusiondirectory.po
index 3c74b74912651b7a5c170f1d6c0e5d9e7110fc33..7134ed794c37f1b9752a95c4bbee18ec15a7d6a8 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -63,7 +63,7 @@ msgstr "Και τα δύο"
 msgid "IP or Mac address"
 msgstr "Διεύθυνση IP ή Mac address"
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Οι ρυθμίσεις FusionDirectory %s/%s  δεν είναι αναγνώσιμες. Ακύρωση."
diff --git a/fusioninventory/locale/en/fusiondirectory.po b/fusioninventory/locale/en/fusiondirectory.po
index 787c163bbb3bb8a6b0db21d7810c61ef72393f1d..8bd87d6fc3c99898b8368138d7500b929efd7639 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:74
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/es/fusiondirectory.po b/fusioninventory/locale/es/fusiondirectory.po
index b9be6e4dafed98e28c687205107998b156dc61e4..b2c7559aac943bfad7523bcd70ef5858a8cb3a30 100644
--- a/fusioninventory/locale/es/fusiondirectory.po
+++ b/fusioninventory/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
diff --git a/fusioninventory/locale/es_CO/fusiondirectory.po b/fusioninventory/locale/es_CO/fusiondirectory.po
index 96bf4d9c5994f0622d7c363b8d43cfa7e2ad0b7b..24c0f297ada60fed4f9f9fe57c21c8a05981d467 100644
--- a/fusioninventory/locale/es_CO/fusiondirectory.po
+++ b/fusioninventory/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "La configuración %s/%s de FusionDirectory no tiene permisos de lectura. Abortado."
diff --git a/fusioninventory/locale/es_VE/fusiondirectory.po b/fusioninventory/locale/es_VE/fusiondirectory.po
index 0585535aa9db729863f573307b373861d86a05a9..9d201addca16cdfaa92eac2c733c225d8e20010f 100644
--- a/fusioninventory/locale/es_VE/fusiondirectory.po
+++ b/fusioninventory/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
diff --git a/fusioninventory/locale/fa_IR/fusiondirectory.po b/fusioninventory/locale/fa_IR/fusiondirectory.po
index 9310bc2b9ab7989c38e665ec87467d2b0f5c205a..31d35dd884dcdd2df77e12ee75328234f0778811 100644
--- a/fusioninventory/locale/fa_IR/fusiondirectory.po
+++ b/fusioninventory/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/fi_FI/fusiondirectory.po b/fusioninventory/locale/fi_FI/fusiondirectory.po
index 4c023be43c9a4ff2242477fc30e382066d456c09..5429c79bf0ef41bc3d1fff17b9d195d02ea1c5dc 100644
--- a/fusioninventory/locale/fi_FI/fusiondirectory.po
+++ b/fusioninventory/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/fr/fusiondirectory.po b/fusioninventory/locale/fr/fusiondirectory.po
index 9f43acc68d98ba90170d708fd589f07a7397438c..0f1a0c54adaefa0e4b972f1cf2bdb033fbe60f16 100644
--- a/fusioninventory/locale/fr/fusiondirectory.po
+++ b/fusioninventory/locale/fr/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -65,7 +65,7 @@ msgstr "Les deux"
 msgid "IP or Mac address"
 msgstr "Adresse IP ou Mac"
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. Abandon."
diff --git a/fusioninventory/locale/hu_HU/fusiondirectory.po b/fusioninventory/locale/hu_HU/fusiondirectory.po
index 515b215fa9712e4bdce9c950f619b4ffd5c06e83..908837a9cb3ceefbe854371114136aacaed9599d 100644
--- a/fusioninventory/locale/hu_HU/fusiondirectory.po
+++ b/fusioninventory/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/id/fusiondirectory.po b/fusioninventory/locale/id/fusiondirectory.po
index a5ceb74740343464bef0fd6feca92bd2a338940e..24fc61b07f4060f95d80c13765ba09ec1ddce20a 100644
--- a/fusioninventory/locale/id/fusiondirectory.po
+++ b/fusioninventory/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/it_IT/fusiondirectory.po b/fusioninventory/locale/it_IT/fusiondirectory.po
index 71dc1cb79e5998fc506cab541b17e41a62632733..e88eaade3f9edad52a14adb8bd0c306755cafba6 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -63,7 +63,7 @@ msgstr "Entrambi"
 msgid "IP or Mac address"
 msgstr "Indirizzo IP o MAC"
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
diff --git a/fusioninventory/locale/lv/fusiondirectory.po b/fusioninventory/locale/lv/fusiondirectory.po
index af6e6bad2a8a66cea6386f56bb1ac741d6c8ec9e..c4df852c25bae0db4ea9e339a2bdedbda9d738d4 100644
--- a/fusioninventory/locale/lv/fusiondirectory.po
+++ b/fusioninventory/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/nb/fusiondirectory.po b/fusioninventory/locale/nb/fusiondirectory.po
index d1ea49d0bc20bc9304692dd21318f7d503f27d01..f9dcb36c34d9d926d7a42d7cd4204cef1fa736f8 100644
--- a/fusioninventory/locale/nb/fusiondirectory.po
+++ b/fusioninventory/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/nl/fusiondirectory.po b/fusioninventory/locale/nl/fusiondirectory.po
index e8e7441fce4f5f7e1122adca1e0f439c7de03574..745ac7c7ae3ab1049f6b7ff047e37963e622f494 100644
--- a/fusioninventory/locale/nl/fusiondirectory.po
+++ b/fusioninventory/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
diff --git a/fusioninventory/locale/pl/fusiondirectory.po b/fusioninventory/locale/pl/fusiondirectory.po
index 61e4362ff4c56351910e7bb3b3c156387560a032..6e65dff57df63b43660ab622eb246f8954d3eff3 100644
--- a/fusioninventory/locale/pl/fusiondirectory.po
+++ b/fusioninventory/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/pt/fusiondirectory.po b/fusioninventory/locale/pt/fusiondirectory.po
index 9874d9e9fc846af04b71fa59011c5c05ec410d12..637618bbffbe62e6c143677a6101cca6b8d7560d 100644
--- a/fusioninventory/locale/pt/fusiondirectory.po
+++ b/fusioninventory/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/pt_BR/fusiondirectory.po b/fusioninventory/locale/pt_BR/fusiondirectory.po
index 75ce5c307dae993de1174b1462e97e72ee6176d0..01044596875c4822f4bd636e92b40cc209aa1124 100644
--- a/fusioninventory/locale/pt_BR/fusiondirectory.po
+++ b/fusioninventory/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -62,7 +62,7 @@ msgstr "Ambos"
 msgid "IP or Mac address"
 msgstr "IP ou endereço MAC"
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Abortado. Configuração %s/%s do FusionDirectory não pôde ser lida."
diff --git a/fusioninventory/locale/ru/fusiondirectory.po b/fusioninventory/locale/ru/fusiondirectory.po
index 7d754bda6d7689b917045d57b00dac22ff35616d..a7fa9c0c26ce3fdba3ae677ee124d929ff56e3a6 100644
--- a/fusioninventory/locale/ru/fusiondirectory.po
+++ b/fusioninventory/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-08 19:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -62,7 +62,7 @@ msgstr "Оба"
 msgid "IP or Mac address"
 msgstr "IP или MAC адрес"
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Конфигурация FusionDirectory %s/%s не читаема. Прервано."
diff --git a/fusioninventory/locale/ru@petr1708/fusiondirectory.po b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
index 27b488c464c2c62a84f00c8ddcfd1238be793f02..d8ffb21fbc4c17e92a7577b6fd385c1ef5f23d7e 100644
--- a/fusioninventory/locale/ru@petr1708/fusiondirectory.po
+++ b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/sv/fusiondirectory.po b/fusioninventory/locale/sv/fusiondirectory.po
index 21c694abd788720cd162845ac79030784ee4713d..65b05e61e177bc0aefbb512c2486118f2eca6039 100644
--- a/fusioninventory/locale/sv/fusiondirectory.po
+++ b/fusioninventory/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Avbryter."
diff --git a/fusioninventory/locale/ug/fusiondirectory.po b/fusioninventory/locale/ug/fusiondirectory.po
index be6e9a8789cf5d6deb2afabe6067fdd187cc3b2e..16c876d8124ac845ea529bc9e85c4c4582da88c9 100644
--- a/fusioninventory/locale/ug/fusiondirectory.po
+++ b/fusioninventory/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/vi_VN/fusiondirectory.po b/fusioninventory/locale/vi_VN/fusiondirectory.po
index bea4bc9aa9689ad6045ff3c8f8be65906be1f72c..58a2a72102a1eadd9c3abbbe39cd5085b3326ae7 100644
--- a/fusioninventory/locale/vi_VN/fusiondirectory.po
+++ b/fusioninventory/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/fusioninventory/locale/zh/fusiondirectory.po b/fusioninventory/locale/zh/fusiondirectory.po
index f6edd860b8f9ee29a8f3898467fb8b261f88841e..5dcdcf60c7888fff5a75f91e3afa5f87b863f171 100644
--- a/fusioninventory/locale/zh/fusiondirectory.po
+++ b/fusioninventory/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:78
+#: html/collect.php:74
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
diff --git a/gpg/addons/gpg/class_pgpServerInfo.inc b/gpg/addons/gpg/class_pgpServerInfo.inc
index 7ff290ea4b1ed2ec5f8c2a7a172b86f0333f8b37..4b6babe27ad8dafff8f938e07d7f3ea0af15762b 100644
--- a/gpg/addons/gpg/class_pgpServerInfo.inc
+++ b/gpg/addons/gpg/class_pgpServerInfo.inc
@@ -24,7 +24,7 @@ class pgpServerInfo extends simplePlugin
   /* This plugin only writes its objectClass */
   var $objectclasses = array('pgpServerInfo');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -42,7 +42,7 @@ class pgpServerInfo extends simplePlugin
         )
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/gpg/locale/ar/fusiondirectory.po b/gpg/locale/ar/fusiondirectory.po
index 6333a745e34b6d8e311d40945e5fc70897e4d260..ff5c549c1b7fa4b93881d66fa49251d1de2d76f5 100644
--- a/gpg/locale/ar/fusiondirectory.po
+++ b/gpg/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/ca/fusiondirectory.po b/gpg/locale/ca/fusiondirectory.po
index fdc9bc2af109776eeb7b2cfea94a5e8597751b5e..e33f298632318a6512b736626d530e1d29250669 100644
--- a/gpg/locale/ca/fusiondirectory.po
+++ b/gpg/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -41,38 +41,38 @@ msgstr "Error de la configuració"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/cs_CZ/fusiondirectory.po b/gpg/locale/cs_CZ/fusiondirectory.po
index 2c923626852abb5946b95b3b3a7dc1bc08b90307..226f47e9cce3ace1c7b303b509983dadc8395d3c 100644
--- a/gpg/locale/cs_CZ/fusiondirectory.po
+++ b/gpg/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -41,38 +41,38 @@ msgstr "Chyba v nastavení"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr "Nejprve je třeba prostřednictvím sekce přídavky nastavit základ GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr "Identifikátor klíče"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Identifikátor uživatele"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr "Čas vytvoření"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr "Skončení platnosti"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr "Algoritmus"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Velikost"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr "Platnost odvolána"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Vypnuto"
diff --git a/gpg/locale/de/fusiondirectory.po b/gpg/locale/de/fusiondirectory.po
index d1df3a926ab772a92a702edf2873ce4ccd3697d7..97db81dbc16f9179b8f6dc9c04d78351041c62a7 100644
--- a/gpg/locale/de/fusiondirectory.po
+++ b/gpg/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -41,38 +41,38 @@ msgstr "Konfigurationsfehler"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr "Schlüsselkennung"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr "Erstellungszeitpunkt"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr "Ablauf"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr "Algorithmus"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Größe"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr "Widerrufen"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Deaktiviert"
diff --git a/gpg/locale/el_GR/fusiondirectory.po b/gpg/locale/el_GR/fusiondirectory.po
index e72c6a4b9cfbcbcfd8f4ab2a57291ba6c8edffde..6b52728b6579963e66e376a1e81a9f350437bcc0 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -42,38 +42,38 @@ msgstr "Σφάλμα ρύθμισης"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr "Θα πρέπει να ρυθμίσετε την GPG base dn μέσω την ενότητας προσθέτωβ πρώτα"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr "Αναγνωριστικό κλειδιού"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Αναγνωριστικό χρήστη"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr "Ημερομηνία δημιουργίας"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr "Λήξη"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr "Αλγόριθμος"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr "Ανεκλήθη"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
diff --git a/gpg/locale/en/fusiondirectory.po b/gpg/locale/en/fusiondirectory.po
index 86302e29ce634955e9fc07487a0d3b9734cb6e97..c1e9eda78c97bcf16b6a7cd5f0971c659af10830 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,41 +17,64 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
-#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
-msgid "GPG server info"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
 msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
 msgstr ""
diff --git a/gpg/locale/es/fusiondirectory.po b/gpg/locale/es/fusiondirectory.po
index 8bc968d9217c6e3f1fcb7ac169b2a87411c78900..1d4c2492dd327bbe0af1e2cc81205c45133e74da 100644
--- a/gpg/locale/es/fusiondirectory.po
+++ b/gpg/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -41,38 +41,38 @@ msgstr "Error en la configuración"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Desactivado"
diff --git a/gpg/locale/es_CO/fusiondirectory.po b/gpg/locale/es_CO/fusiondirectory.po
index 71daaedb7dcfd31fc89ed39749cd52e9f179a233..4a234f348eeb198fe74b3824dbf104f856c36385 100644
--- a/gpg/locale/es_CO/fusiondirectory.po
+++ b/gpg/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -41,38 +41,38 @@ msgstr "Error de configuración"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "ID de usuario"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/es_VE/fusiondirectory.po b/gpg/locale/es_VE/fusiondirectory.po
index 888ba15992d8f4d397e8738fa042a8551e4ba75b..3e710c9871118adedd0e65a3afff3c87866fb903 100644
--- a/gpg/locale/es_VE/fusiondirectory.po
+++ b/gpg/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -41,38 +41,38 @@ msgstr "Error en la configuración"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Desactivado"
diff --git a/gpg/locale/fa_IR/fusiondirectory.po b/gpg/locale/fa_IR/fusiondirectory.po
index a562fcb4a98d3eec5f50f697e7e8e5d683e647bb..8251f57f9a690ee1724be8afece2184a1a2fc9a2 100644
--- a/gpg/locale/fa_IR/fusiondirectory.po
+++ b/gpg/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/fi_FI/fusiondirectory.po b/gpg/locale/fi_FI/fusiondirectory.po
index 583463f22c3acc106b49dab7b0c941bd175eda9c..7ba394a8c3e3416a81facfb7ec643d1ded371a78 100644
--- a/gpg/locale/fi_FI/fusiondirectory.po
+++ b/gpg/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Käyttäjätunnus"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/fr/fusiondirectory.po b/gpg/locale/fr/fusiondirectory.po
index a73d0218b6f63b23e4fc80ee637b4647c2d7b6ae..a881031782a7f210a5d094a4f281740638dda9ca 100644
--- a/gpg/locale/fr/fusiondirectory.po
+++ b/gpg/locale/fr/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -44,38 +44,38 @@ msgstr "Erreur de configuration"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr "Vous devez configurer d'abord le DN de base de GPG, dans la section «Configuration»"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr "ID de la clef"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr "Date de création"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr "Date d'expiration"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr "Algorithme"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Taille"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr "Révoquée"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Désactivée"
diff --git a/gpg/locale/hu_HU/fusiondirectory.po b/gpg/locale/hu_HU/fusiondirectory.po
index ce53e078df288920ebbc6746351ecc292200f029..79dc559f810e2bc50349752bfda0b8f40eb17d36 100644
--- a/gpg/locale/hu_HU/fusiondirectory.po
+++ b/gpg/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/id/fusiondirectory.po b/gpg/locale/id/fusiondirectory.po
index deafafbd0c5c1e2c6dd33c54f7646648f800244d..c8e557d186fac2e10636da844644a653648e7e12 100644
--- a/gpg/locale/id/fusiondirectory.po
+++ b/gpg/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/it_IT/fusiondirectory.po b/gpg/locale/it_IT/fusiondirectory.po
index 6baddc09d201402ae5aff0feccd9fb50e75f4806..4f4c042c34f5f5e102787d11ae2ffbd7499a5cea 100644
--- a/gpg/locale/it_IT/fusiondirectory.po
+++ b/gpg/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -43,38 +43,38 @@ msgstr "Errore di configurazione"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr "Devi prima di tutto configurare la bse dn per GPG, nella sezione addons"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr "ID della chiave"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "ID dell'utente"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr "Data di creazione"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr "Data di scadenza"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr "Algoritmo"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Dimensione"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr "Revocato"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Disabilitato"
diff --git a/gpg/locale/lv/fusiondirectory.po b/gpg/locale/lv/fusiondirectory.po
index 88f6bd28213ca7fe30229aed3a02a20e25d24c53..16b2b17b10f2ffb3ffe32c627207d5c17c732705 100644
--- a/gpg/locale/lv/fusiondirectory.po
+++ b/gpg/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Lietotāja ID"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/nb/fusiondirectory.po b/gpg/locale/nb/fusiondirectory.po
index 548b46c6ae2cfc7c03d9c3f09fcd55888cf75207..a79c6e8842a559eea6981547ac983859d0b6dc3d 100644
--- a/gpg/locale/nb/fusiondirectory.po
+++ b/gpg/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/nl/fusiondirectory.po b/gpg/locale/nl/fusiondirectory.po
index 92ffaee38d49d4e0ce5a8f089a5ec7f7d1d33cb6..8deba8dc5c6ea29aa97cfd23f8f36c800af08107 100644
--- a/gpg/locale/nl/fusiondirectory.po
+++ b/gpg/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -41,38 +41,38 @@ msgstr "Configuratie fout"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Grootte"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Niet actief"
diff --git a/gpg/locale/pl/fusiondirectory.po b/gpg/locale/pl/fusiondirectory.po
index cfd2e20dd419d62b778986f990e322be6ca68ab7..ed31a7f73923fbfe32fc3e5b8150dcc3b1d474dd 100644
--- a/gpg/locale/pl/fusiondirectory.po
+++ b/gpg/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -41,38 +41,38 @@ msgstr "BÅ‚Ä…d konfiguracji"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Rozmiar"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Wyłączone"
diff --git a/gpg/locale/pt/fusiondirectory.po b/gpg/locale/pt/fusiondirectory.po
index b201deb2c289781308cef38135bc402b88320482..cdfecc2e6e6019cc64f8087bd721d9a5d65aebcd 100644
--- a/gpg/locale/pt/fusiondirectory.po
+++ b/gpg/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -41,38 +41,38 @@ msgstr "Erro de configuração"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "ID do usuário"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/pt_BR/fusiondirectory.po b/gpg/locale/pt_BR/fusiondirectory.po
index e64d755ed0c0e1d1da1d9ab047b72a8e380f6fb1..32aee75385532c5add571daef4be3563d447e0ed 100644
--- a/gpg/locale/pt_BR/fusiondirectory.po
+++ b/gpg/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -41,38 +41,38 @@ msgstr "Erro de configuração"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "ID de usuário"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/ru/fusiondirectory.po b/gpg/locale/ru/fusiondirectory.po
index 03cd51e797b01ef9e1e2bd1053ac4549f8822f5d..848ec449c15d9c8377204a6ced2c772e6b4124aa 100644
--- a/gpg/locale/ru/fusiondirectory.po
+++ b/gpg/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-12 05:51+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -43,38 +43,38 @@ msgstr "Ошибка конфигурации"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr "ID ключа"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr "Время создания"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr "Когда истекает"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr "Алгоритм"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Размер"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr "Отозван"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Отключен"
diff --git a/gpg/locale/ru@petr1708/fusiondirectory.po b/gpg/locale/ru@petr1708/fusiondirectory.po
index d0613d4326cc4a7fb3d146e9da27d097db3f2173..5179bd258f0ce977c1be71bc7d6a28631e525800 100644
--- a/gpg/locale/ru@petr1708/fusiondirectory.po
+++ b/gpg/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/sv/fusiondirectory.po b/gpg/locale/sv/fusiondirectory.po
index f22be32d974b63046e0f9e234ed346b8d5c662ae..8b9887c6b9c448f200e25a82040274bcefdfe6ee 100644
--- a/gpg/locale/sv/fusiondirectory.po
+++ b/gpg/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -41,38 +41,38 @@ msgstr "Konfigurationsfel"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "Användar-ID"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "Storlek"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Avaktiverad"
diff --git a/gpg/locale/ug/fusiondirectory.po b/gpg/locale/ug/fusiondirectory.po
index 9cab4a29b53879a889c7a08060f54b7ea6010372..d3ee13a39e7f06e679dda97ba55e39f36485928f 100644
--- a/gpg/locale/ug/fusiondirectory.po
+++ b/gpg/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/locale/vi_VN/fusiondirectory.po b/gpg/locale/vi_VN/fusiondirectory.po
index 854d66b28f21fa878a16589ebb53332ed955b8fc..331bb745e677b9f22788cc26d4e4c1d261e2fbcd 100644
--- a/gpg/locale/vi_VN/fusiondirectory.po
+++ b/gpg/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -41,38 +41,38 @@ msgstr "Lỗi cấu hình"
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "ID người dùng"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr "Vô hiệu hóa/ Tắt chức năng"
diff --git a/gpg/locale/zh/fusiondirectory.po b/gpg/locale/zh/fusiondirectory.po
index 90439c37c93c381f2b79a58560c4ec52c7e87501..8816437036d9f017174b3265d0616bed78ec3b88 100644
--- a/gpg/locale/zh/fusiondirectory.po
+++ b/gpg/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -41,38 +41,38 @@ msgstr ""
 msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
 msgid "Key ID"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
 msgstr "用户 ID"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
 msgstr "大小"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 msgid "Revoked"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
 msgstr ""
diff --git a/gpg/personal/gpg/class_gpgAccount.inc b/gpg/personal/gpg/class_gpgAccount.inc
index b2c4ad39c533f4e4633282ae9d1da10f6614334b..61570cbecdad8ff766e1be89cde6fef34acd1ce5 100644
--- a/gpg/personal/gpg/class_gpgAccount.inc
+++ b/gpg/personal/gpg/class_gpgAccount.inc
@@ -50,7 +50,7 @@ class gpgAccount extends simplePlugin
       'plIcon'          => 'geticon.php?context=applications&icon=gpg&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=gpg&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 }
diff --git a/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc b/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
index 998b37b20488df7eed8c889d22f785ae6979110d..f6c6b5c1050dc3942d25eebd01ff0d71f0585b76 100644
--- a/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
+++ b/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
@@ -77,18 +77,18 @@ class pgpKeySelect extends simpleSelectManagement
     if (count($value) == 0) {
       return '&nbsp;';
     }
-    $return = self::$func($value[0]);
+    $return = static::$func($value[0]);
     return ($return === ''?'&nbsp;':$return);
   }
 
   static function filterPgpDate($value = array())
   {
-    return self::filterSingleValue($value, 'pgpDate');
+    return static::filterSingleValue($value, 'pgpDate');
   }
 
   static function filterPgpSize($value = array())
   {
-    return self::filterSingleValue($value, 'pgpSize');
+    return static::filterSingleValue($value, 'pgpSize');
   }
 
   static function filterPgpRevoked($value = array())
@@ -96,7 +96,7 @@ class pgpKeySelect extends simpleSelectManagement
     if (empty($value)) {
       return 'No';
     }
-    return self::pgpRevoked($value[0]);
+    return static::pgpRevoked($value[0]);
   }
 
   static function pgpDate($date)
diff --git a/ipmi/admin/systems/ipmi/class_ipmiClient.inc b/ipmi/admin/systems/ipmi/class_ipmiClient.inc
index 54c832e631928bfa0e195bd44fd3d90ff502fa3b..5e9d88058b5478a859df90cb032358f8e10814eb 100644
--- a/ipmi/admin/systems/ipmi/class_ipmiClient.inc
+++ b/ipmi/admin/systems/ipmi/class_ipmiClient.inc
@@ -34,7 +34,7 @@ class ipmiClient extends simplePlugin
       'plCategory'      => array('workstation','server'),
       'plObjectType'    => array('workstation','server'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ipmi/locale/ar/fusiondirectory.po b/ipmi/locale/ar/fusiondirectory.po
index 350590ccab664da9cf33c86523dbb4dbdbdc9f6c..02c25db07c6ac06ec4e670b80b1ad4ad024ba2a6 100644
--- a/ipmi/locale/ar/fusiondirectory.po
+++ b/ipmi/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/ipmi/locale/ca/fusiondirectory.po b/ipmi/locale/ca/fusiondirectory.po
index 5673ee7e3f4947d86658f2abcaedaf0b069639bb..972bfa9602e874b11001bcdbe87e1958c00829f2 100644
--- a/ipmi/locale/ca/fusiondirectory.po
+++ b/ipmi/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/ipmi/locale/cs_CZ/fusiondirectory.po b/ipmi/locale/cs_CZ/fusiondirectory.po
index ae0f88ea2ce4305c8fbfd4c7bdb98d7d2028ee85..d67f72c63356bd38f007426a7d185a23b5845a26 100644
--- a/ipmi/locale/cs_CZ/fusiondirectory.po
+++ b/ipmi/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/ipmi/locale/de/fusiondirectory.po b/ipmi/locale/de/fusiondirectory.po
index 251bd640594189ad43936ade6c59fb31e70c4584..f374076a77929918e49a7086bb720a4d8d8de5e7 100644
--- a/ipmi/locale/de/fusiondirectory.po
+++ b/ipmi/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/ipmi/locale/el_GR/fusiondirectory.po b/ipmi/locale/el_GR/fusiondirectory.po
index 0519ef4c2bb01333e6768fa2efae9eaf8e40e156..550fb3a57fc24d4b1bd5152e1863dab58d75d76d 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/ipmi/locale/en/fusiondirectory.po b/ipmi/locale/en/fusiondirectory.po
index 5eff9442e9cd600f72c0d2b86bb64ee30dbdd7d8..856cc94083feb2a06d452c28b0e4259896d536c3 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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 f0592387a6154e5ee982dd5ef1de72501d496e24..7b346b877b6509657c657c08d206e81e2c64477c 100644
--- a/ipmi/locale/es/fusiondirectory.po
+++ b/ipmi/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/ipmi/locale/es_CO/fusiondirectory.po b/ipmi/locale/es_CO/fusiondirectory.po
index b55c6d091a18ade3095a203ac8b13824a9b7f9c3..2cf545efebcaa34af70a32c5b3f714ab89cb233b 100644
--- a/ipmi/locale/es_CO/fusiondirectory.po
+++ b/ipmi/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/ipmi/locale/es_VE/fusiondirectory.po b/ipmi/locale/es_VE/fusiondirectory.po
index f325ccf35f67dddb842f05815308a6413e523a81..eea53f281c4e332f822bc5fb107099a713cf4407 100644
--- a/ipmi/locale/es_VE/fusiondirectory.po
+++ b/ipmi/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/ipmi/locale/fa_IR/fusiondirectory.po b/ipmi/locale/fa_IR/fusiondirectory.po
index 53c6269b41ccee7b0fb0155051184ade64d8f695..5032319150cded65cf00c64f38fa355c2b9b225a 100644
--- a/ipmi/locale/fa_IR/fusiondirectory.po
+++ b/ipmi/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/ipmi/locale/fi_FI/fusiondirectory.po b/ipmi/locale/fi_FI/fusiondirectory.po
index bb38b526e421bd0d2320b295cf1b050fcdc6619a..007e08842ddd31c56f786a723a63f8c28e7a9686 100644
--- a/ipmi/locale/fi_FI/fusiondirectory.po
+++ b/ipmi/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/ipmi/locale/fr/fusiondirectory.po b/ipmi/locale/fr/fusiondirectory.po
index 00d53aab0e18da357c488537c2ca163957c13385..f3f0ffffd1506e43622b2d1c5d2f6eaca8c6bc14 100644
--- a/ipmi/locale/fr/fusiondirectory.po
+++ b/ipmi/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/ipmi/locale/hu_HU/fusiondirectory.po b/ipmi/locale/hu_HU/fusiondirectory.po
index 9da0989f0782c5942bdf997aa5120436be8497ab..23ccfa14163a75f5ab7fd6f983b95a895a08b454 100644
--- a/ipmi/locale/hu_HU/fusiondirectory.po
+++ b/ipmi/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/ipmi/locale/id/fusiondirectory.po b/ipmi/locale/id/fusiondirectory.po
index f10248e58d280261bf6324797b631824f1894269..f0f6ee46bfe6ed70aef7bdfff77ad8a8af9b0cf7 100644
--- a/ipmi/locale/id/fusiondirectory.po
+++ b/ipmi/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/ipmi/locale/it_IT/fusiondirectory.po b/ipmi/locale/it_IT/fusiondirectory.po
index c6a7c11421549af15da9d1440ce2f297b483f465..1ec0e00a990d4073d58caffc12921cfa42742c97 100644
--- a/ipmi/locale/it_IT/fusiondirectory.po
+++ b/ipmi/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/ipmi/locale/lv/fusiondirectory.po b/ipmi/locale/lv/fusiondirectory.po
index 3e03fe6138229293e699ae02251f41d34f067092..8125194e72fd847380565be661cf0d1c2d7cd7e3 100644
--- a/ipmi/locale/lv/fusiondirectory.po
+++ b/ipmi/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/ipmi/locale/nb/fusiondirectory.po b/ipmi/locale/nb/fusiondirectory.po
index 447a696df1eeba544040bc6bfb2aab1b083e3c65..8d595a2a045910351aa7bb05693e47453b179b78 100644
--- a/ipmi/locale/nb/fusiondirectory.po
+++ b/ipmi/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/ipmi/locale/nl/fusiondirectory.po b/ipmi/locale/nl/fusiondirectory.po
index 2ad44669deb89ed63a292fc38a8ce3388bed548c..75b0e01886cf0f49e081d0a828eb3321b2ab6a72 100644
--- a/ipmi/locale/nl/fusiondirectory.po
+++ b/ipmi/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/ipmi/locale/pl/fusiondirectory.po b/ipmi/locale/pl/fusiondirectory.po
index c783346a0564debf38161e878c13f1619cc47bbd..d9a94a0f4b15fbbf48e7a4e0f947395af9a73727 100644
--- a/ipmi/locale/pl/fusiondirectory.po
+++ b/ipmi/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/ipmi/locale/pt/fusiondirectory.po b/ipmi/locale/pt/fusiondirectory.po
index aaa3ed6f9d6fd9ce6dda1aa35e469858f387cd9e..b8dd8c373d1d0f5d39d94d69b0d68db891dceeaa 100644
--- a/ipmi/locale/pt/fusiondirectory.po
+++ b/ipmi/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/ipmi/locale/pt_BR/fusiondirectory.po b/ipmi/locale/pt_BR/fusiondirectory.po
index cc4876be1f757bba3b6bfff9775115a555ce50d8..fe8d7d5e0aaed091c15272b8b5dc6c16e6e8aabf 100644
--- a/ipmi/locale/pt_BR/fusiondirectory.po
+++ b/ipmi/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/ipmi/locale/ru/fusiondirectory.po b/ipmi/locale/ru/fusiondirectory.po
index 5020661c8330062d30f838873995453b5f055ea1..242180ac9fbe313cc3e760ebdfe0d1e8204f601c 100644
--- a/ipmi/locale/ru/fusiondirectory.po
+++ b/ipmi/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/ipmi/locale/ru@petr1708/fusiondirectory.po b/ipmi/locale/ru@petr1708/fusiondirectory.po
index 5d4847a1a26dd3c4c23b36697eb12df49275eb68..87b179e7d4d5e5935803312d35121091541b8232 100644
--- a/ipmi/locale/ru@petr1708/fusiondirectory.po
+++ b/ipmi/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/ipmi/locale/sv/fusiondirectory.po b/ipmi/locale/sv/fusiondirectory.po
index 0f2c61749b76a736a7aa9d96d4ab03efd5ced8ee..45427e336c86121db45ed76d2d4e1d22d4a5862a 100644
--- a/ipmi/locale/sv/fusiondirectory.po
+++ b/ipmi/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/ipmi/locale/ug/fusiondirectory.po b/ipmi/locale/ug/fusiondirectory.po
index e000d62d8f3c56701e88437daceec749e7c30593..c8640fb2bc0c83f69a72b9522be0fd102435b103 100644
--- a/ipmi/locale/ug/fusiondirectory.po
+++ b/ipmi/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/ipmi/locale/vi_VN/fusiondirectory.po b/ipmi/locale/vi_VN/fusiondirectory.po
index 79e29f06301203fc733ce53702113ac781e042cc..1f19b6ece538e3721545d79dfb158a3bb266f444 100644
--- a/ipmi/locale/vi_VN/fusiondirectory.po
+++ b/ipmi/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/ipmi/locale/zh/fusiondirectory.po b/ipmi/locale/zh/fusiondirectory.po
index 0583427521cc70cd19591c3b9969252d875422db..ab0f9a25afbb0307accf1e8443b23a3886468230 100644
--- a/ipmi/locale/zh/fusiondirectory.po
+++ b/ipmi/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc b/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc
index 38dadd4dc415f9c987fe7e9913acc8d8cf45d7cb..27fc59cea9cb1eccd286ee628f52e664b839961f 100644
--- a/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc
+++ b/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc
@@ -67,7 +67,7 @@ class serviceKolab extends simpleService
       'plShortName'     => _('Kolab 2 mail'),
       'plDescription'   => _('Kolab 2 mail service'),
       'plIcon'          => 'geticon.php?context=applications&icon=kolab2&size=16',
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -79,7 +79,7 @@ class serviceKolab extends simpleService
   {
     return array (
       'section1' => array (
-        'name'  => _('Informations'),
+        'name'  => _('Information'),
         'attrs' => array (
           new StringAttribute('', '', 'k', FALSE, 'kolab'),
           new SetAttribute(new StringAttribute('', '', 'kolabHost')),
diff --git a/kolab2/locale/ar/fusiondirectory.po b/kolab2/locale/ar/fusiondirectory.po
index 426489eb0cd5bf1c2d9d372a8802a1eed3d6aaa4..74585b1ced358629466ee11f0fdf704e6d1643ce 100644
--- a/kolab2/locale/ar/fusiondirectory.po
+++ b/kolab2/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "معلومات"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "خطأ"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr ""
diff --git a/kolab2/locale/ca/fusiondirectory.po b/kolab2/locale/ca/fusiondirectory.po
index 275361371942c997d89ef24c4d55e6f945b996da..61a00ec6f207e9d4b460f99330fdcf59f38b3b4f 100644
--- a/kolab2/locale/ca/fusiondirectory.po
+++ b/kolab2/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informació"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Error d'LDAP"
diff --git a/kolab2/locale/cs_CZ/fusiondirectory.po b/kolab2/locale/cs_CZ/fusiondirectory.po
index 75bbafd2720c57c20a28e440be39d99e84ae357b..f8551b21cf0de79d2f439a4b6c1f3c590d7e814f 100644
--- a/kolab2/locale/cs_CZ/fusiondirectory.po
+++ b/kolab2/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr "Předávající stroj"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Počítač sloužící k předávání zpráv"
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr "E-mailová služba Kolab 2"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr "Informace"
+msgid "Information"
+msgstr "informace"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr "Hranice, po jejímž překročení budou uživatelé varováni ohledně
 msgid "Warn users when using more than X% of their mail quota"
 msgstr "Varovat uživatele, pokud využijí více než X% objemu své kvóty na e-maily"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Nastavení Free/Busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Umožnit neověřeným uživatelům stahovat informace z Free/Busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr "Počet dnů, které zahrnout při vytváření seznamů free/busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr "Zahrnout údaje z X dnů v minulosti při vytváření free/busy seznamů"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "Sítě, ze kterých je možné používat SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "Počítače/sítě které mohou předávat"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr "stroje/sítě které mohou předávat (jednotlivé položky oddělujte čárkou)"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "Inteligentní předávající (smarthost) / předávající stroj SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Přijímat Internetovou poštu"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Přijímat i zprávy, které přicházejí z jiných domén, přes neověřené SMTP servery"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "účet neexistuje v Kolabu!"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Chyba"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr "název stroje"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Chyba LDAP"
diff --git a/kolab2/locale/de/fusiondirectory.po b/kolab2/locale/de/fusiondirectory.po
index 4a9237447dc365252a742b9b0a07bda3779dcf2b..22ccaeb8b778de5804ea25256fdfc747492f36e5 100644
--- a/kolab2/locale/de/fusiondirectory.po
+++ b/kolab2/locale/de/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -182,7 +182,7 @@ msgid "Relay host"
 msgstr "Relay host"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Host für Mail Relay"
 
@@ -195,8 +195,8 @@ msgid "Kolab 2 mail service"
 msgstr "Kolab-2-Maildienst"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr "Informationen"
+msgid "Information"
+msgstr "Information"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -299,65 +299,65 @@ msgstr "Quota Benutzungslimit bevor Benutzer gewarnt werden (%)"
 msgid "Warn users when using more than X% of their mail quota"
 msgstr "Benutzer warnen wenn sie mehr als X% o ihrer Mailquota verwenden"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Frei/Belegt-Einstellungen"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr "Anzahl der Tage die beinhaltet werden sollen wenn frei/beschäftigt Listen erstellt werden"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr "Daten von X Tagen in der Vergangenheit einschließen wenn frei/beschäftigt Listen erstellt werden"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "SMTP privilegierte Netzwerke"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "Rechner/Netzwerke, denen Weiterleitung erlaubt ist"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr "Hosts/Netwerke, denen das relay erlaubt ist (mehrere Werte komma-getrennt)"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhost"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Akzeptiere Internet-Mail"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Akzeptiere Mails von anderen Domänen über nicht-authentifiziertes SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "Kolab-Konto existiert nicht!"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr "Hostname"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
diff --git a/kolab2/locale/el_GR/fusiondirectory.po b/kolab2/locale/el_GR/fusiondirectory.po
index 6f40e09c398114b227be499ebdc994c3c91fe125..cf3741487dbe31c41aeee40b166ca5303770dc89 100644
--- a/kolab2/locale/el_GR/fusiondirectory.po
+++ b/kolab2/locale/el_GR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -182,7 +182,7 @@ msgid "Relay host"
 msgstr "Σύστημα δρομολόγησης"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Η χρησιμοποιούμενη υπηρεσία για την δρομολόγηση μηνυμάτων"
 
@@ -195,7 +195,7 @@ msgid "Kolab 2 mail service"
 msgstr "Υπηρεσία αλληλογραφίας Kolab 2 "
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr "Πληροφορίες"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -299,65 +299,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Ρυθμίσεις διαθεσιμότητας"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Να επιτρέπεται η μη πιστοποιημένη λήψει πληροφοριών διαθεσιμότητς χρήστη"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "Προνομιακά δίκτυα SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Αποδοχή αλληλογραφίας διαδικτύου"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Εσωτερικό σφάλμα"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "Δεν υπάρχει λογαριασμός Kolab"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr "όνομα συστήματος"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
diff --git a/kolab2/locale/en/fusiondirectory.po b/kolab2/locale/en/fusiondirectory.po
index b83b683af499bc9911bf50d6ea8db0138183039d..aa48e2d5d41a059ffa46730f6c17866cae50c1f9 100644
--- a/kolab2/locale/en/fusiondirectory.po
+++ b/kolab2/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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,160 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid "Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -26,7 +180,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -39,7 +193,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -143,219 +297,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/es/fusiondirectory.po b/kolab2/locale/es/fusiondirectory.po
index 5ba2fd4e44129da83abe94499cb3643b9771da70..50c728ae9e56d07f3c368282a5d06e7ac29cb3b6 100644
--- a/kolab2/locale/es/fusiondirectory.po
+++ b/kolab2/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr "Servidor de reenvío (relay)"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Equipo usado para reenviar correos"
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Información"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Configuración de Presencia"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permite descarga no autentificada de información de presencia."
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "Redes privilegiadas SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhost"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Aceptar Correo Electrónico de internet"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Aceptar correo desde otros dominios que no usen autentificación SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "error interno"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "¡La cuenta Kolab no existe!"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr "nombre de Maquina"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Error LDAP"
diff --git a/kolab2/locale/es_CO/fusiondirectory.po b/kolab2/locale/es_CO/fusiondirectory.po
index 75b225b2ba39e3c8d1010ed4cf9f49e4c65f670e..05b2f707eac7420667fc890cdb5e574bef5b018e 100644
--- a/kolab2/locale/es_CO/fusiondirectory.po
+++ b/kolab2/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr "Datos"
+msgid "Information"
+msgstr "Información"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Error Interno"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Error LDAP"
diff --git a/kolab2/locale/es_VE/fusiondirectory.po b/kolab2/locale/es_VE/fusiondirectory.po
index 5c3ab1c31875fd909c5f8d54883f2482a7146cd5..09ab5d750dbb460f6405b3491916c05d21686cce 100644
--- a/kolab2/locale/es_VE/fusiondirectory.po
+++ b/kolab2/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr "Servidor de reenvío (relay)"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Equipo usado para reenviar correos"
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Información"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Configuración de Presencia"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permite descarga no autentificada de información de presencia."
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "Redes privilegiadas SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhost"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Aceptar Correo Electrónico de internet"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Aceptar correo desde otros dominios que no usen autentificación SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "error interno"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "¡La cuenta Kolab no existe!"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr "nombre de Maquina"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Error de LDAP"
diff --git a/kolab2/locale/fa_IR/fusiondirectory.po b/kolab2/locale/fa_IR/fusiondirectory.po
index 65f6b361ba85bfef16f60afa42f073a07f2cdab1..07fec1880391e9a73c3986c6f1c24b727e18e23c 100644
--- a/kolab2/locale/fa_IR/fusiondirectory.po
+++ b/kolab2/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "خطای داخلی"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "خطا"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "خطای LDAP"
diff --git a/kolab2/locale/fi_FI/fusiondirectory.po b/kolab2/locale/fi_FI/fusiondirectory.po
index cba18c0a9caa285986481d2a946223281897c701..5192e3f3215edbdf216d6553e3f221c1c0cb5d02 100644
--- a/kolab2/locale/fi_FI/fusiondirectory.po
+++ b/kolab2/locale/fi_FI/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:47+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Virhe"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "LDAP virhe"
diff --git a/kolab2/locale/fr/fusiondirectory.po b/kolab2/locale/fr/fusiondirectory.po
index 4a23bbc5f27cc192f8f5b2c4a1817d6b2ef1ba3c..5be49071b83654ac8216763551c895ec888e2211 100644
--- a/kolab2/locale/fr/fusiondirectory.po
+++ b/kolab2/locale/fr/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -183,7 +183,7 @@ msgid "Relay host"
 msgstr "Hôte relai"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Machine utilisée pour relayer les courriels"
 
@@ -196,8 +196,8 @@ msgid "Kolab 2 mail service"
 msgstr "Service de courriel Kolab 2"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr "Informations"
+msgid "Information"
+msgstr "Information"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -300,65 +300,65 @@ msgstr "Limite du quota avant de prévenir les utilisateurs (%)"
 msgid "Warn users when using more than X% of their mail quota"
 msgstr "Avertissez les utilisateurs quand ils utilisent plus de X% de leur quota de messagerie"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Préférences de Free/Busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permettre le téléchargement des informations Free/Busy de manière anonyme"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr "Nombre de jours à inclure lors de la création d'une liste Free/Busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr "Nombre de jours dans le passé à inclure lors de la création d'une liste Free/Busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "Réseaux SMTP privilégiés"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "Machines/Réseaux autorisés à relayer"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr "Machines/Réseaux qui peuvent relayer des courriels (plusieurs valeurs  séparées par des virgules)"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "Relais SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Accepter le courrier électronique venant d'internet"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Accepter les messages venant d'autres domaines par du SMTP non authentifié"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "Le compte Kolab n'existe pas !"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr "Nom d'hôte"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Erreur LDAP"
diff --git a/kolab2/locale/hu_HU/fusiondirectory.po b/kolab2/locale/hu_HU/fusiondirectory.po
index a95800d626a15757828cf22cface4552a289385f..d2045f106af827ba4030d88dd9a9bf9facf59f2c 100644
--- a/kolab2/locale/hu_HU/fusiondirectory.po
+++ b/kolab2/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr ""
diff --git a/kolab2/locale/id/fusiondirectory.po b/kolab2/locale/id/fusiondirectory.po
index 2cb4bb4f0f229c779ab343b812dd164c5ca9e930..2f932414351436cfd8caf857b8519cfe66d60e5f 100644
--- a/kolab2/locale/id/fusiondirectory.po
+++ b/kolab2/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr ""
diff --git a/kolab2/locale/it_IT/fusiondirectory.po b/kolab2/locale/it_IT/fusiondirectory.po
index 62e1d7fb7bf05e08ee54b6b9e482de8e8fdac8bb..5e0c8f321376c50b816827a51ab31e0385ef3680 100644
--- a/kolab2/locale/it_IT/fusiondirectory.po
+++ b/kolab2/locale/it_IT/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:24+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -183,7 +183,7 @@ msgid "Relay host"
 msgstr "Host a cui inviare i messaggi in uscita (Relay host)"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Host usato per il  relay delle mail"
 
@@ -196,8 +196,8 @@ msgid "Kolab 2 mail service"
 msgstr "Servizio di posta elettronica Kolab 2"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr "Informazioni"
+msgid "Information"
+msgstr "Informazione"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -300,65 +300,65 @@ msgstr "Quota limite di occupazione, prima di avvertire l'utente (%)"
 msgid "Warn users when using more than X% of their mail quota"
 msgstr "Avverti gli utenti quando stanno utilizzando più di X% o della loro quota di casella di posta elettronica"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Impostazioni delle opzioni di disponibilità"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permetti il download delle informazioni di disponibilità in modo anonimo"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr "Numero di giorni da includere durante la creazione degli elenchi free/busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr "Includere i dati da X giorni nel passato quando si creano gli elenchi free/busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "Rete SMTP privilegiata"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "Hosts/reti abilitate al relay"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr "Clienti/Reti a cui è consentito il relay (più valori separati da virgola)"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "Raccordo SMTP smarthost/relayhost"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Accetta la posta elettronica che viene da Internet"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Accetta i messaggi che vengono da altri domini, via degli SMTP non autentificati"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "L'account Kolab non esiste !"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Errore"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr "Nome dell'host"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Errore LDAP"
diff --git a/kolab2/locale/lv/fusiondirectory.po b/kolab2/locale/lv/fusiondirectory.po
index 538b349f84bd17d2ac694a5a855d32e75d82c925..e31af6c38693df9a074b377ba6251b3a1c0d4a93 100644
--- a/kolab2/locale/lv/fusiondirectory.po
+++ b/kolab2/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informācija"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Iekšējā kļūda"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Kļūda"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "LDAP kļūda"
diff --git a/kolab2/locale/nb/fusiondirectory.po b/kolab2/locale/nb/fusiondirectory.po
index cb22913671525a68ffce6323bc4968fc81723eb5..8f1a3836ff1186e2157bbc24364eafda180efe18 100644
--- a/kolab2/locale/nb/fusiondirectory.po
+++ b/kolab2/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Feil"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "LDAP-feil"
diff --git a/kolab2/locale/nl/fusiondirectory.po b/kolab2/locale/nl/fusiondirectory.po
index 979d2e36d93f27ad53c8c97998f926c685ad5078..5b07caecfc37573cf31710b77266140bdc1ff10d 100644
--- a/kolab2/locale/nl/fusiondirectory.po
+++ b/kolab2/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr "Relay host"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Host die gebruikt wordt om E-mails te relayen"
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr "Informatie"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Free/Busy instellingen"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Sta ongeauthoriseerd downloaden van Free/Busy informatie toe"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "SMTP toegestane netwerken"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "Hosts/netwerken die E-mail mogen ralayen"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhost"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Accepteer Internet E-mail"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Accepteer E-mail van andere domeinen over niet geauthenticeerde SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Interne error"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "Kolab account bestaat niet!"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Fout"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr "hostname"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "LDAP fout"
diff --git a/kolab2/locale/pl/fusiondirectory.po b/kolab2/locale/pl/fusiondirectory.po
index f607d7836e069390c83672d9529a164dfeabb121..c7d90a0f1fa9dfc46b83848bf30a877c879dcb14 100644
--- a/kolab2/locale/pl/fusiondirectory.po
+++ b/kolab2/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr "Host przekazujÄ…cy"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "Host użyty do przekazywania poczty"
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informacja"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Ustawienia wolny / zajęty"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Zezwól na nieautoryzowane pobieranie informacji Free/Busy"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "uprzywilejowane sieci SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "Hosty/sieci uprawnione do przekazywania"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhost"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "Zezwalaj na pocztÄ™ z internetu"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Akceptuj pocztÄ™ z innych domen przez nie-autentykowane SMTP"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "błąd LDAP"
diff --git a/kolab2/locale/pt/fusiondirectory.po b/kolab2/locale/pt/fusiondirectory.po
index 3739b4b1db18f82d526974d9c7490db1b1c5ef9d..fef50c8afd07d4d2d66bc27da58ee76d21e7243d 100644
--- a/kolab2/locale/pt/fusiondirectory.po
+++ b/kolab2/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informação"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Erro"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Erro de LDAP"
diff --git a/kolab2/locale/pt_BR/fusiondirectory.po b/kolab2/locale/pt_BR/fusiondirectory.po
index 055fce03e7e4e7ed7d27c568f56e5017b83aca06..167014a4c0e489f1102d690edd954ce7c9359787 100644
--- a/kolab2/locale/pt_BR/fusiondirectory.po
+++ b/kolab2/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr "Host de transmissão"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr "Informações"
+msgid "Information"
+msgstr "Informação"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr "Conta do Kolab inexistente!"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Erro"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Erro de LDAP"
diff --git a/kolab2/locale/ru/fusiondirectory.po b/kolab2/locale/ru/fusiondirectory.po
index 9dd761c740d4d3ed6170477a6b465241d13f1d1e..aa5dedf111a23544ab1b76f6a2e092b3cfc5a470 100644
--- a/kolab2/locale/ru/fusiondirectory.po
+++ b/kolab2/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr "Информация"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Ошибка"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
diff --git a/kolab2/locale/ru@petr1708/fusiondirectory.po b/kolab2/locale/ru@petr1708/fusiondirectory.po
index 992fe5af8bc822a32748442b6101bf2fd54e8711..d01991dc74d81721b6f039aa021e7c8367a4f07c 100644
--- a/kolab2/locale/ru@petr1708/fusiondirectory.po
+++ b/kolab2/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr ""
diff --git a/kolab2/locale/sv/fusiondirectory.po b/kolab2/locale/sv/fusiondirectory.po
index 8b1b4b82cd7506cf8cc3902336ca42efed21c935..7e9df0452ab736893c9820ca47b2b63f5c094a10 100644
--- a/kolab2/locale/sv/fusiondirectory.po
+++ b/kolab2/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Information"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Fel"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "LDAP-fel"
diff --git a/kolab2/locale/ug/fusiondirectory.po b/kolab2/locale/ug/fusiondirectory.po
index 5c09b61a5249b289da391462953be32374d44ce1..3c08406be3eabf6c00bbf4c4630a2b9fb9329673 100644
--- a/kolab2/locale/ug/fusiondirectory.po
+++ b/kolab2/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr ""
diff --git a/kolab2/locale/vi_VN/fusiondirectory.po b/kolab2/locale/vi_VN/fusiondirectory.po
index 658ab5c76a9cbff9e4398076772ba508f0651473..a98c565269b5ece64c0fd4fcef5b1b746e45bc57 100644
--- a/kolab2/locale/vi_VN/fusiondirectory.po
+++ b/kolab2/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Thông tin"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr "Lá»—i ná»™i bá»™"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
diff --git a/kolab2/locale/zh/fusiondirectory.po b/kolab2/locale/zh/fusiondirectory.po
index dfadb343fe3d3cb5176d5096bb7819ff01a2a943..bedb72578270ec16d1868b36be3769f63d6c644c 100644
--- a/kolab2/locale/zh/fusiondirectory.po
+++ b/kolab2/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-05-12 13:36+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgid "Relay host"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:185
+#: admin/systems/services/kolab2/class_serviceKolab.inc:189
 msgid "Host used to relay mails"
 msgstr "中继邮件使用的主机"
 
@@ -194,8 +194,8 @@ msgid "Kolab 2 mail service"
 msgstr ""
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "提示信息"
 
 #: admin/systems/services/kolab2/class_serviceKolab.inc:87
 msgid "Postfix mydomain"
@@ -298,65 +298,65 @@ msgstr ""
 msgid "Warn users when using more than X% of their mail quota"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:153
+#: admin/systems/services/kolab2/class_serviceKolab.inc:155
 msgid "Free/Busy settings"
 msgstr "Free/Busy 设置"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:156
-#: admin/systems/services/kolab2/class_serviceKolab.inc:157
+#: admin/systems/services/kolab2/class_serviceKolab.inc:158
+#: admin/systems/services/kolab2/class_serviceKolab.inc:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "允许不登录下载 Free/Busy 信息"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:161
+#: admin/systems/services/kolab2/class_serviceKolab.inc:163
 msgid "Number of days to include when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:162
+#: admin/systems/services/kolab2/class_serviceKolab.inc:164
 msgid "Include data from X days in the past when creating free/busy lists"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:170
+#: admin/systems/services/kolab2/class_serviceKolab.inc:174
 msgid "SMTP privileged networks"
 msgstr "SMTP 授权网络"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:173
+#: admin/systems/services/kolab2/class_serviceKolab.inc:177
 msgid "Hosts/networks allowed to relay"
 msgstr "允许中继的主机/网络"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:174
+#: admin/systems/services/kolab2/class_serviceKolab.inc:178
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:182
+#: admin/systems/services/kolab2/class_serviceKolab.inc:186
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhost"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:190
+#: admin/systems/services/kolab2/class_serviceKolab.inc:194
 msgid "Accept Internet Mail"
 msgstr "允许 Internet  邮件"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:193
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
+#: admin/systems/services/kolab2/class_serviceKolab.inc:197
+#: admin/systems/services/kolab2/class_serviceKolab.inc:198
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "允许从其他未认证 SMTP 发送邮件"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:271
+#: admin/systems/services/kolab2/class_serviceKolab.inc:275
 msgid "Kolab account does not exist!"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "Error"
 msgstr "错误"
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
+#: admin/systems/services/kolab2/class_serviceKolab.inc:279
 msgid "hostname"
 msgstr ""
 
-#: admin/systems/services/kolab2/class_serviceKolab.inc:284
-#: admin/systems/services/kolab2/class_serviceKolab.inc:295
+#: admin/systems/services/kolab2/class_serviceKolab.inc:288
+#: admin/systems/services/kolab2/class_serviceKolab.inc:299
 msgid "LDAP error"
 msgstr "LDAP 错误"
diff --git a/kolab2/personal/kolab2/class_kolabAccount.inc b/kolab2/personal/kolab2/class_kolabAccount.inc
index e9f8965fe2f13a0e35bd71359fca5ec83d8e154f..1c4a734f6933aaa5bacab2ec4b952e85fe7c1a1a 100644
--- a/kolab2/personal/kolab2/class_kolabAccount.inc
+++ b/kolab2/personal/kolab2/class_kolabAccount.inc
@@ -75,7 +75,7 @@ class kolabAccount extends simplePlugin
   var $objectclasses  = array("kolabInetOrgPerson");
   var $displayHeader  = TRUE;
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling  */
   static function plInfo()
   {
     return array(
@@ -86,7 +86,7 @@ class kolabAccount extends simplePlugin
       'plSelfModify'    => TRUE,
       'plPriority'      => 20,
       'plObjectType'    => array('user'),
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ldapdump/addons/ldapdump/class_ldapDump.inc b/ldapdump/addons/ldapdump/class_ldapDump.inc
index ff933783efc87d232657aa6432ea5ea48c5a14ab..9ebad8ee0d93eb48154252310425f4d1393c6d6c 100644
--- a/ldapdump/addons/ldapdump/class_ldapDump.inc
+++ b/ldapdump/addons/ldapdump/class_ldapDump.inc
@@ -28,7 +28,7 @@ class ldapDump extends simplePlugin
       'plObjectType'  => array('special'),
       'plPriority'    => 99,
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ldapdump/locale/ar/fusiondirectory.po b/ldapdump/locale/ar/fusiondirectory.po
index b2e4b03c65ad3e9357ef647540a249b6ecffe317..e0ecb549d6b1156e05d51c4c84f950059992053e 100644
--- a/ldapdump/locale/ar/fusiondirectory.po
+++ b/ldapdump/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/ldapdump/locale/ca/fusiondirectory.po b/ldapdump/locale/ca/fusiondirectory.po
index b1525125acd9250991289baa3329a50ef7e6098a..33e142223c31c53172b0abe6d78aab234fd75e0b 100644
--- a/ldapdump/locale/ca/fusiondirectory.po
+++ b/ldapdump/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/ldapdump/locale/cs_CZ/fusiondirectory.po b/ldapdump/locale/cs_CZ/fusiondirectory.po
index 9dc65e667e270d517cca4bdc7d5dcd2354cc3ace..006acb70da2f42020d196d37dae2d1c39abc8d31 100644
--- a/ldapdump/locale/cs_CZ/fusiondirectory.po
+++ b/ldapdump/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/ldapdump/locale/de/fusiondirectory.po b/ldapdump/locale/de/fusiondirectory.po
index 0fdbaf134172f46f030dfdb7b22ed01b83a901e7..df1c565ffde52817a8a5a50aec1550c24808dd6b 100644
--- a/ldapdump/locale/de/fusiondirectory.po
+++ b/ldapdump/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/ldapdump/locale/el_GR/fusiondirectory.po b/ldapdump/locale/el_GR/fusiondirectory.po
index 26df525fda1c45ca9ab2815b95f6366b7d0e12d8..ddfdbb57d0df8ef32468a290f5d4ed396003662b 100644
--- a/ldapdump/locale/el_GR/fusiondirectory.po
+++ b/ldapdump/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/ldapdump/locale/en/fusiondirectory.po b/ldapdump/locale/en/fusiondirectory.po
index adbe0b5d7ee7634ea2b5b68bbdd1900a7f1fa5bd..e308ae3c18069a29e897616de6cf06b4231e33a2 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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 97aa7474e5c3b1b7fa0c0433cfdba3d6d7f21306..631ae3037a99107d867017db8db36c729e86793d 100644
--- a/ldapdump/locale/es/fusiondirectory.po
+++ b/ldapdump/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/ldapdump/locale/es_CO/fusiondirectory.po b/ldapdump/locale/es_CO/fusiondirectory.po
index a0ce701383796e973d3b608a7f7400361eb91de4..e1c6b35ed4507fcca98b461544ad683cce8d26b7 100644
--- a/ldapdump/locale/es_CO/fusiondirectory.po
+++ b/ldapdump/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/ldapdump/locale/es_VE/fusiondirectory.po b/ldapdump/locale/es_VE/fusiondirectory.po
index 1cba4739c1e244065f9f107e570238b1ec8f97be..2f5a7f41d466206b36f168fb9e9ecd9cdaf7532e 100644
--- a/ldapdump/locale/es_VE/fusiondirectory.po
+++ b/ldapdump/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/ldapdump/locale/fa_IR/fusiondirectory.po b/ldapdump/locale/fa_IR/fusiondirectory.po
index 005258741dd3ac2c556ec57832a4039b7b7f7a91..72423359c3f7a2ec727de56f80330b21a20ad224 100644
--- a/ldapdump/locale/fa_IR/fusiondirectory.po
+++ b/ldapdump/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/ldapdump/locale/fi_FI/fusiondirectory.po b/ldapdump/locale/fi_FI/fusiondirectory.po
index bcd7ce8dbc034dcff08c4a4af550cfd0d5c5763e..1d2a00b52b6cacb435df5574146cc6a58ac65427 100644
--- a/ldapdump/locale/fi_FI/fusiondirectory.po
+++ b/ldapdump/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/ldapdump/locale/fr/fusiondirectory.po b/ldapdump/locale/fr/fusiondirectory.po
index a50b0837d63e47d95563cea24849aa02fbe2bbf5..080c1c6eb5338c9ce7d04583e4f00e2500c18be2 100644
--- a/ldapdump/locale/fr/fusiondirectory.po
+++ b/ldapdump/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/ldapdump/locale/hu_HU/fusiondirectory.po b/ldapdump/locale/hu_HU/fusiondirectory.po
index 1ce68ecf6f911c85b3d952b04fad316f9fc4766b..ca93e64cf9a7549f742e3cb5d6e2e2730c683628 100644
--- a/ldapdump/locale/hu_HU/fusiondirectory.po
+++ b/ldapdump/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/ldapdump/locale/id/fusiondirectory.po b/ldapdump/locale/id/fusiondirectory.po
index efa38660fc3bcaea710c5ee0adc61293c6dbe64c..5ec2018f5274535c4b92744a278346f3a0ca155f 100644
--- a/ldapdump/locale/id/fusiondirectory.po
+++ b/ldapdump/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/ldapdump/locale/it_IT/fusiondirectory.po b/ldapdump/locale/it_IT/fusiondirectory.po
index 21b079a5a0d64ade04fb75dec06048d708de3672..3307ba4745b59ad1eb4058c666889b14f832e589 100644
--- a/ldapdump/locale/it_IT/fusiondirectory.po
+++ b/ldapdump/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:24+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/ldapdump/locale/lv/fusiondirectory.po b/ldapdump/locale/lv/fusiondirectory.po
index f4031a819bab0357008da3b7e4d54d223200a414..9bf62b1270cecb326dccbc3ec70a6b54bf29a1d2 100644
--- a/ldapdump/locale/lv/fusiondirectory.po
+++ b/ldapdump/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/ldapdump/locale/nb/fusiondirectory.po b/ldapdump/locale/nb/fusiondirectory.po
index 880388970496f514f9ac2e7d5be77e9a216f90ed..62d0b9b632d7fae824a228b06cdfc70bbaf7f082 100644
--- a/ldapdump/locale/nb/fusiondirectory.po
+++ b/ldapdump/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/ldapdump/locale/nl/fusiondirectory.po b/ldapdump/locale/nl/fusiondirectory.po
index 80cc2cab376ede053e1ebcc4ebce5543e3de1d70..adf2f01f23871439b6431c768e778a88aa36691a 100644
--- a/ldapdump/locale/nl/fusiondirectory.po
+++ b/ldapdump/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/ldapdump/locale/pl/fusiondirectory.po b/ldapdump/locale/pl/fusiondirectory.po
index 38e8f27021b74130e1ef99857c30f7f0ad8acba2..5489b709a61873e4cfe9a63749a283c97360a02b 100644
--- a/ldapdump/locale/pl/fusiondirectory.po
+++ b/ldapdump/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/ldapdump/locale/pt/fusiondirectory.po b/ldapdump/locale/pt/fusiondirectory.po
index 50f3895ad6d1d5cef19b540f44a8bf61c128e76b..42a68424f1d7dddd3cf8994878dc15124ac2c658 100644
--- a/ldapdump/locale/pt/fusiondirectory.po
+++ b/ldapdump/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/ldapdump/locale/pt_BR/fusiondirectory.po b/ldapdump/locale/pt_BR/fusiondirectory.po
index db1379b4f8a2c7f04516888c3ba4873c2da993df..b70bab5416636405bf33ed97be2362086543a142 100644
--- a/ldapdump/locale/pt_BR/fusiondirectory.po
+++ b/ldapdump/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/ldapdump/locale/ru/fusiondirectory.po b/ldapdump/locale/ru/fusiondirectory.po
index b85e0585c20a923e5623396147f005a380cecfd8..13cc686fc9fccfd5ded143f60398339d18917a48 100644
--- a/ldapdump/locale/ru/fusiondirectory.po
+++ b/ldapdump/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-08 19:09+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/ldapdump/locale/ru@petr1708/fusiondirectory.po b/ldapdump/locale/ru@petr1708/fusiondirectory.po
index ed18ef5d02f6a0b1ee2dfecdb7ccc90dc90b6eba..e92e326b92dfdded18483d14bbfcc8ca36e26692 100644
--- a/ldapdump/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapdump/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/ldapdump/locale/sv/fusiondirectory.po b/ldapdump/locale/sv/fusiondirectory.po
index 647eda2b40226dbeb6892b1feabd367da5446565..60fe6ea1b9854eac29f97701bedde609e5836b1c 100644
--- a/ldapdump/locale/sv/fusiondirectory.po
+++ b/ldapdump/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/ldapdump/locale/ug/fusiondirectory.po b/ldapdump/locale/ug/fusiondirectory.po
index d92c44c6db9af450010809dd2d88a722cb774cc0..fc69be33291cff79c859e568aeb11a34ce227c90 100644
--- a/ldapdump/locale/ug/fusiondirectory.po
+++ b/ldapdump/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/ldapdump/locale/vi_VN/fusiondirectory.po b/ldapdump/locale/vi_VN/fusiondirectory.po
index 00ebfae358e7aed1a8fca6c9e86d965bd8e32870..af1c7eeedd9df109322e953b6227a616dc70755d 100644
--- a/ldapdump/locale/vi_VN/fusiondirectory.po
+++ b/ldapdump/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/ldapdump/locale/zh/fusiondirectory.po b/ldapdump/locale/zh/fusiondirectory.po
index b572353f623cf47d9b682dfd0855f1c352134a0f..9ced9b9edbf3ed5020e7b39145ef76e2cf916f02 100644
--- a/ldapdump/locale/zh/fusiondirectory.po
+++ b/ldapdump/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/ldapmanager/addons/ldapmanager/class_ldapmanager.inc b/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
index 1311b6f374d431ca8fff8578cb4370e4398c8902..607b3df2dbc44f2b593e73ac24eb6ef75b200010 100644
--- a/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
+++ b/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
@@ -38,7 +38,7 @@ class BaseSelectorOrDnAttribute extends BaseSelectorAttribute
 
 class ldapmanager extends simplePlugin
 {
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
diff --git a/ldapmanager/locale/ar/fusiondirectory.po b/ldapmanager/locale/ar/fusiondirectory.po
index 2b4941194ce71ea6daa5e782de5a96e76bc1a838..c6f197c3ec479f310c0f0869401f35ef57376357 100644
--- a/ldapmanager/locale/ar/fusiondirectory.po
+++ b/ldapmanager/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr ""
 
@@ -190,20 +190,20 @@ msgstr ""
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "خطأ"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/ca/fusiondirectory.po b/ldapmanager/locale/ca/fusiondirectory.po
index 7a196054d8a43793ba4ec0080572faf200d1ef8f..35919a8ee79b0a4faf939f1847c9b79838ac022b 100644
--- a/ldapmanager/locale/ca/fusiondirectory.po
+++ b/ldapmanager/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
@@ -190,20 +190,20 @@ msgstr "Error d'LDAP"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/cs_CZ/fusiondirectory.po b/ldapmanager/locale/cs_CZ/fusiondirectory.po
index 6f6c1d785ea88979db8e56ab4e28e02f79826932..8b6b2843fb961ab79b76121ef887d2b675a89ad2 100644
--- a/ldapmanager/locale/cs_CZ/fusiondirectory.po
+++ b/ldapmanager/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr "Importovat LDIF soubor"
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Chyba LDAP"
 
@@ -190,20 +190,20 @@ msgstr "Chyba LDAP"
 msgid "No such object %s!"
 msgstr "Objekt %s neexistuje!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Chyba oprávnění"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Nejste oprávněni exportovat %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Chyba"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Vytvoření ldap exportu se nezdařilo, chyba je v %s!"
diff --git a/ldapmanager/locale/de/fusiondirectory.po b/ldapmanager/locale/de/fusiondirectory.po
index a588a4f585d0d236cf9c91d8def72de9218c26ed..0899563cae763ff3d4dad51d1547c15002419262 100644
--- a/ldapmanager/locale/de/fusiondirectory.po
+++ b/ldapmanager/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -182,7 +182,7 @@ msgid "Import LDIF file"
 msgstr "LDIF-Datei importieren"
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -191,20 +191,20 @@ msgstr "LDAP-Fehler"
 msgid "No such object %s!"
 msgstr "Objekt %s nicht gefunden!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Sie haben keine Berechtigung, um %s zu exportieren!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/el_GR/fusiondirectory.po b/ldapmanager/locale/el_GR/fusiondirectory.po
index 74451cb11e65ca416133eb477a600c62c7b3e87c..8a3a7d501213a24b63af38742b56bc4059acc23b 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -182,7 +182,7 @@ msgid "Import LDIF file"
 msgstr "Εισαγωγή αρχείου LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
@@ -191,20 +191,20 @@ msgstr "Σφάλμα LDAP"
 msgid "No such object %s!"
 msgstr "Δεν υπάρχει τέτοιος αντικείμενο %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Σφάλμα άδειας"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Δεν έχετε άδεια για εξαγωγή %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Αποτυχία δημιουργίας εξαγωγής ldap, το σφάλμα ήταν \"%s\"!"
diff --git a/ldapmanager/locale/en/fusiondirectory.po b/ldapmanager/locale/en/fusiondirectory.po
index b7be5274ef46a70de1d3d0fe87994d77f25dacd5..6b1cee0450db9c2cf2828ab4fd9d57c734cf33ec 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
-msgid "Import LDIF file"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
-msgid "LDAP error"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:155
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
-msgid "Error"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:52
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:52
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:62
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:62
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:69
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:199
+msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:94
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:175
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
-msgid "Success"
+#: addons/ldapmanager/class_ldapmanager.inc:182
+msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:258
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/es/fusiondirectory.po b/ldapmanager/locale/es/fusiondirectory.po
index cd7cd503606ada4e4c5d1a3e21cd2dfde7d3789f..9530d827ad5442a3b0242fc258130a8c21a1be3f 100644
--- a/ldapmanager/locale/es/fusiondirectory.po
+++ b/ldapmanager/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -190,20 +190,20 @@ msgstr "Error LDAP"
 msgid "No such object %s!"
 msgstr "No existe el objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "No tiene permiso para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/es_CO/fusiondirectory.po b/ldapmanager/locale/es_CO/fusiondirectory.po
index f0aa8fb592ee5d4a2727ce04808baa469fc879d0..96c4bb85a839b9e2f92ac2ec2caa49cec64b245c 100644
--- a/ldapmanager/locale/es_CO/fusiondirectory.po
+++ b/ldapmanager/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -190,20 +190,20 @@ msgstr "Error LDAP"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/es_VE/fusiondirectory.po b/ldapmanager/locale/es_VE/fusiondirectory.po
index 105201b81e0465de6972bc32f0492d0067757d69..78026c7497c2f6d303789e958bd970d3afc3d87c 100644
--- a/ldapmanager/locale/es_VE/fusiondirectory.po
+++ b/ldapmanager/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
@@ -190,20 +190,20 @@ msgstr "Error de LDAP"
 msgid "No such object %s!"
 msgstr "No existe el objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "No tiene permiso para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/fa_IR/fusiondirectory.po b/ldapmanager/locale/fa_IR/fusiondirectory.po
index 20c95a3ea2ecca60dfc8f04ed8545db8d60f7afb..4d52dd28209abdf72fbb17acd0752b39df02abaa 100644
--- a/ldapmanager/locale/fa_IR/fusiondirectory.po
+++ b/ldapmanager/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
@@ -190,20 +190,20 @@ msgstr "خطای LDAP"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "خطا"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/fi_FI/fusiondirectory.po b/ldapmanager/locale/fi_FI/fusiondirectory.po
index 78c3019bce31cfed9fd074adfd66f16a71d7999c..4c17d81658677a37ee778a51aeaca6dfc209d799 100644
--- a/ldapmanager/locale/fi_FI/fusiondirectory.po
+++ b/ldapmanager/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:49+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
@@ -190,20 +190,20 @@ msgstr "LDAP virhe"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Virhe"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/fr/fusiondirectory.po b/ldapmanager/locale/fr/fusiondirectory.po
index 06e185da0591e5cc4370409f83f235e5bf765341..b3dfe61d50fec4cadfbfb86c82c982b9fbee42e6 100644
--- a/ldapmanager/locale/fr/fusiondirectory.po
+++ b/ldapmanager/locale/fr/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 14:07+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -184,7 +184,7 @@ msgid "Import LDIF file"
 msgstr "Importer un fichier LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -193,20 +193,20 @@ msgstr "Erreur LDAP"
 msgid "No such object %s!"
 msgstr "Objet '%s' non trouvé !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Erreur de permission"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Vous n'avez pas l'autorisation d'exporter '%s' !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Erreur"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Échec de l’exportation de votre annuaire LDAP, l'erreur est '%s' !"
diff --git a/ldapmanager/locale/hu_HU/fusiondirectory.po b/ldapmanager/locale/hu_HU/fusiondirectory.po
index 5b49c0f27c9ca5c5ac9c3a49a6c62cf6493c644a..f10598b52e9d60fb30b436876306ea28060cb16d 100644
--- a/ldapmanager/locale/hu_HU/fusiondirectory.po
+++ b/ldapmanager/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr ""
 
@@ -190,20 +190,20 @@ msgstr ""
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/id/fusiondirectory.po b/ldapmanager/locale/id/fusiondirectory.po
index 7794693add79200c4f7b10ff444aa3443f53c144..1938f2015a0de3dced621b01defd25d835831a22 100644
--- a/ldapmanager/locale/id/fusiondirectory.po
+++ b/ldapmanager/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr ""
 
@@ -190,20 +190,20 @@ msgstr ""
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/it_IT/fusiondirectory.po b/ldapmanager/locale/it_IT/fusiondirectory.po
index 2da1804266fc0c2b2fdadd5d925ecdd8cd836d2c..fbfa5dceeb586975274f13939f83bab921c10688 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:24+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -182,7 +182,7 @@ msgid "Import LDIF file"
 msgstr "Importa file LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
@@ -191,20 +191,20 @@ msgstr "Errore LDAP"
 msgid "No such object %s!"
 msgstr "Nessun oggetto %s !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Errore d'autorizzazione"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Non hai il permesso di esportare %s !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Errore"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Impossibile generare l'esportazione LDAP, errore '%s' !"
diff --git a/ldapmanager/locale/lv/fusiondirectory.po b/ldapmanager/locale/lv/fusiondirectory.po
index 2d20e627bf8a3ea5d08863903b60d4bcaa8f015e..7de42d30137b045af2768f36a04100a106a95893 100644
--- a/ldapmanager/locale/lv/fusiondirectory.po
+++ b/ldapmanager/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
@@ -190,20 +190,20 @@ msgstr "LDAP kļūda"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Kļūda"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/nb/fusiondirectory.po b/ldapmanager/locale/nb/fusiondirectory.po
index c3af19317b04e3fc294606f587701dbb3d0522ee..eb99f4859c5c36d1feae78c005e5cb3518c8c6c5 100644
--- a/ldapmanager/locale/nb/fusiondirectory.po
+++ b/ldapmanager/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
@@ -190,20 +190,20 @@ msgstr "LDAP-feil"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Feil"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/nl/fusiondirectory.po b/ldapmanager/locale/nl/fusiondirectory.po
index e146b54dcb2c5e4d863e47a83508d300b337e1df..3b29c221ee9b4322a2a3b9093149a39f48ef119b 100644
--- a/ldapmanager/locale/nl/fusiondirectory.po
+++ b/ldapmanager/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -190,20 +190,20 @@ msgstr "LDAP fout"
 msgid "No such object %s!"
 msgstr "Zo geen object %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Permissiefout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Je hebt geen rechten om te exporten %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Fout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/pl/fusiondirectory.po b/ldapmanager/locale/pl/fusiondirectory.po
index c6bb519cac7b730443460e47a702e8bdae47d8a9..e1fdc909effb36450a49671703d250a3ea49a351 100644
--- a/ldapmanager/locale/pl/fusiondirectory.po
+++ b/ldapmanager/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
@@ -190,20 +190,20 @@ msgstr "błąd LDAP"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/pt/fusiondirectory.po b/ldapmanager/locale/pt/fusiondirectory.po
index 34a7d628cdf646f34053aa2fbfc949d83a8842ea..22261093f498e1a6f34bc03fff038482b6715693 100644
--- a/ldapmanager/locale/pt/fusiondirectory.po
+++ b/ldapmanager/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -190,20 +190,20 @@ msgstr "Erro de LDAP"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Erro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/pt_BR/fusiondirectory.po b/ldapmanager/locale/pt_BR/fusiondirectory.po
index b7ce3067f986e8f10137899fee443e0ce0fb04ad..03d50688953f9c9a9b19deabbb246c1c0e4b9214 100644
--- a/ldapmanager/locale/pt_BR/fusiondirectory.po
+++ b/ldapmanager/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -190,20 +190,20 @@ msgstr "Erro de LDAP"
 msgid "No such object %s!"
 msgstr "Não há esse objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Erro de permissão"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Você não tem permissão para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Erro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/ru/fusiondirectory.po b/ldapmanager/locale/ru/fusiondirectory.po
index d2e0609e4bb6693e8a89184e3f6592538fc8ff61..7210a84db6860929578c3415c99cc3ee4a4a31f0 100644
--- a/ldapmanager/locale/ru/fusiondirectory.po
+++ b/ldapmanager/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-12 06:45+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -183,7 +183,7 @@ msgid "Import LDIF file"
 msgstr "Импорт, LDIF файл"
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
@@ -192,20 +192,20 @@ msgstr "Ошибка LDAP"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Ошибка доступа"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Ошибка"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/ru@petr1708/fusiondirectory.po b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
index f779f460a5a19607ae67543e5ed23af66d7114fc..789e9ff973ba99440f75c9eb1eb2a7ecb38495f1 100644
--- a/ldapmanager/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr ""
 
@@ -190,20 +190,20 @@ msgstr ""
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/sv/fusiondirectory.po b/ldapmanager/locale/sv/fusiondirectory.po
index cd742b94f47f99df3fc57e924191a67adf2ce68e..d9047b78e2dc586708396649d597131d8db7aece 100644
--- a/ldapmanager/locale/sv/fusiondirectory.po
+++ b/ldapmanager/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
@@ -190,20 +190,20 @@ msgstr "LDAP-fel"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Rättighetsfel"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Fel"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/ug/fusiondirectory.po b/ldapmanager/locale/ug/fusiondirectory.po
index 673a0476bcec4e5309245f57168d0c1898177c4c..7f3511f052a847f295e76906ba922ea01bbd8a0a 100644
--- a/ldapmanager/locale/ug/fusiondirectory.po
+++ b/ldapmanager/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr ""
 
@@ -190,20 +190,20 @@ msgstr ""
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/vi_VN/fusiondirectory.po b/ldapmanager/locale/vi_VN/fusiondirectory.po
index d62b1703838879871ff94f51167e8b0b7fb3d3d2..9d6107eae142627a73c3676768cf948bbf80306e 100644
--- a/ldapmanager/locale/vi_VN/fusiondirectory.po
+++ b/ldapmanager/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
@@ -190,20 +190,20 @@ msgstr "Lá»—i LDAP"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr "Lỗi về cấp phép"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "Lá»—i"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/zh/fusiondirectory.po b/ldapmanager/locale/zh/fusiondirectory.po
index e9780032e51b1e31d17890f318f4057059679e45..4ed5865b0a8da9e26760d0c9db27a57bccdfcfc0 100644
--- a/ldapmanager/locale/zh/fusiondirectory.po
+++ b/ldapmanager/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -181,7 +181,7 @@ msgid "Import LDIF file"
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:198
+#: addons/ldapmanager/class_ldapmanager.inc:199
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
@@ -190,20 +190,20 @@ msgstr "LDAP 错误"
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:176
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 msgid "Error"
 msgstr "错误"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:183
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/mail/admin/groups/mail/class_groupMail.inc b/mail/admin/groups/mail/class_groupMail.inc
index cddb80afb12e28e62973152cb553c921985d2c9d..2d00fc8a7cc17ab3501e935cb3e6e6895e62fb3e 100644
--- a/mail/admin/groups/mail/class_groupMail.inc
+++ b/mail/admin/groups/mail/class_groupMail.inc
@@ -39,7 +39,7 @@ class mailgroup extends simplePlugin
 {
   var $displayHeader  = TRUE;
   var $objectclasses  = array('fdGroupMail');
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -48,7 +48,7 @@ class mailgroup extends simplePlugin
       'plSelfModify'   => FALSE,
       'plPriority'     => 10,
       'plObjectType'   => array('group', 'ogroup-user'),
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -56,7 +56,7 @@ class mailgroup extends simplePlugin
   {
     return array(
       'main' => array(
-        'name'  => _('Informations'),
+        'name'  => _('Information'),
         'attrs' => array(
           new MailAttribute (
             _('Primary address'), _('The primary mail address'),
diff --git a/mail/admin/systems/services/imap/class_serviceIMAP.inc b/mail/admin/systems/services/imap/class_serviceIMAP.inc
index facdf31db9673fbe64d367bf168bcb2b7362ade7..37c56065714d32bd00545b8c55e8764bd1c17f77 100644
--- a/mail/admin/systems/services/imap/class_serviceIMAP.inc
+++ b/mail/admin/systems/services/imap/class_serviceIMAP.inc
@@ -25,7 +25,7 @@ class serviceIMAP extends simpleService
   /* This plugin only writes its objectClass */
   var $objectclasses = array('fdImapServer');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -33,7 +33,7 @@ class serviceIMAP extends simpleService
       'plDescription' => _('IMAP/POP3').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=applications&icon=imap&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -50,12 +50,15 @@ class serviceIMAP extends simpleService
     return '<b>This server runs an IMAP or POP3 server</b>'.parent::execute();
   }
 
+  function save()
+  {
+    parent::save();
+  }
+
   protected function post_save()
   {
     parent::post_save();
-    if (!$this->initially_was_account) {
-      mailMethod::resetMailServersCache();
-    }
+    mailMethod::resetMailServersCache();
   }
 
   protected function post_remove ()
diff --git a/mail/config/mail/class_mailPluginConfig.inc b/mail/config/mail/class_mailPluginConfig.inc
index feffdb424ad93adb193462513d63479881d30c43..9557d395c953bf750b43eab75976064fbc06f81c 100644
--- a/mail/config/mail/class_mailPluginConfig.inc
+++ b/mail/config/mail/class_mailPluginConfig.inc
@@ -30,7 +30,7 @@ class mailPluginConfig extends simplePlugin
       "plPriority"      => 3,
       "plObjectType"    => array("configuration"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/mail/locale/ar/fusiondirectory.po b/mail/locale/ar/fusiondirectory.po
index 2aabd1e3a1b20bca2d7fdd14327e644364e640cb..7084b6cacc21de9c280717e9ab03229c6278e5f3 100644
--- a/mail/locale/ar/fusiondirectory.po
+++ b/mail/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "معلومات"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/ca/fusiondirectory.po b/mail/locale/ca/fusiondirectory.po
index 767a0ce100a9b7f14b53b0272fcf46b6ad378093..4394ad28ff2ae14403543a477678487857fa9fbd 100644
--- a/mail/locale/ca/fusiondirectory.po
+++ b/mail/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informació"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/cs_CZ/fusiondirectory.po b/mail/locale/cs_CZ/fusiondirectory.po
index ddfcff9b75bb3343357716c988b592133a109b5f..d69f523741dc882c62b45b5cd75d10bd318b5038 100644
--- a/mail/locale/cs_CZ/fusiondirectory.po
+++ b/mail/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr "Předvolby skupinového e-mailu"
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informace"
+msgid "Information"
+msgstr "informace"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/de/fusiondirectory.po b/mail/locale/de/fusiondirectory.po
index 6f195b58dc015cd1af2794dc1f62d9fb12f76925..423b845ca8fac3b49b4dc359a03281133dc71c94 100644
--- a/mail/locale/de/fusiondirectory.po
+++ b/mail/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr "Gruppenmailoptionen"
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informationen"
+msgid "Information"
+msgstr "Information"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/el_GR/fusiondirectory.po b/mail/locale/el_GR/fusiondirectory.po
index 078c4f0cbf9bb81da79840d4ca9e902ceb446ecf..8edf54bc390cfa7f051d9b7eb220c6777e689125 100644
--- a/mail/locale/el_GR/fusiondirectory.po
+++ b/mail/locale/el_GR/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -285,7 +285,7 @@ msgid "Group mail options"
 msgstr "Επιλογές ομάδων αλληλογραφίας"
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr "Πληροφορίες"
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/en/fusiondirectory.po b/mail/locale/en/fusiondirectory.po
index 1d2eebb1362b98f3d463aa579046ce1b1b25e480..9aa43cb901f793382749672aee611d600ffd3fd4 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Information"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/es/fusiondirectory.po b/mail/locale/es/fusiondirectory.po
index dafef33bdb5be4ce354aae85cf5926f53780a60b..bd589a027727b098cea88202e88a808ba781d0a8 100644
--- a/mail/locale/es/fusiondirectory.po
+++ b/mail/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Información"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/es_CO/fusiondirectory.po b/mail/locale/es_CO/fusiondirectory.po
index 894fd1558419dfb1c77d8d84fe2994242e6a23c0..7d990a4a8e90f56b4cfd8bdb8fcfa21c97787fe2 100644
--- a/mail/locale/es_CO/fusiondirectory.po
+++ b/mail/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Datos"
+msgid "Information"
+msgstr "Información"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/es_VE/fusiondirectory.po b/mail/locale/es_VE/fusiondirectory.po
index 7f41adbb5e956f77405a3947dc76e7c8fba05f65..d7afe2d6434d35681eaf2e951b47fc46859f4b8b 100644
--- a/mail/locale/es_VE/fusiondirectory.po
+++ b/mail/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Información"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/fa_IR/fusiondirectory.po b/mail/locale/fa_IR/fusiondirectory.po
index 223e3390879b3ac6aea50bfdddd2baf81126c59c..df29789060545182e57ff6efc69b8b8a3f83a3f8 100644
--- a/mail/locale/fa_IR/fusiondirectory.po
+++ b/mail/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -282,7 +282,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/fi_FI/fusiondirectory.po b/mail/locale/fi_FI/fusiondirectory.po
index 4104248a7b81a3d7b26c330fcd6439d367fc2c9c..98abfb4b17cb387a9d69e676e5d035d1da55749e 100644
--- a/mail/locale/fi_FI/fusiondirectory.po
+++ b/mail/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-14 18:38+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -282,7 +282,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/fr/fusiondirectory.po b/mail/locale/fr/fusiondirectory.po
index 8821298036405c6f57446e1baa59e86a4dbf02e0..77cb56c10334d55c55381f244e92d2fcd69ecd95 100644
--- a/mail/locale/fr/fusiondirectory.po
+++ b/mail/locale/fr/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -284,8 +284,8 @@ msgid "Group mail options"
 msgstr "Options de courriel du groupe"
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informations"
+msgid "Information"
+msgstr "Information"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/hu_HU/fusiondirectory.po b/mail/locale/hu_HU/fusiondirectory.po
index 10621378fd86aa29cc032cb3a16604729fe130a0..749a800b59c5e387dd6cca8f385bd1ac20c22722 100644
--- a/mail/locale/hu_HU/fusiondirectory.po
+++ b/mail/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -282,7 +282,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/id/fusiondirectory.po b/mail/locale/id/fusiondirectory.po
index c6f8b59b876804823663f83596b55e6b3b56cf1f..6d643f2b23670dad2fccd9e06d126f51d1014606 100644
--- a/mail/locale/id/fusiondirectory.po
+++ b/mail/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -282,7 +282,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/it_IT/fusiondirectory.po b/mail/locale/it_IT/fusiondirectory.po
index 02a57815f7fd48caaf94437eea279c22053a099b..6b2322d6ec4d286c7e807e7051b0bf85808a2ef9 100644
--- a/mail/locale/it_IT/fusiondirectory.po
+++ b/mail/locale/it_IT/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:24+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -284,8 +284,8 @@ msgid "Group mail options"
 msgstr "Opzioni per le mail di gruppo"
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informazioni"
+msgid "Information"
+msgstr "Informazione"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/lv/fusiondirectory.po b/mail/locale/lv/fusiondirectory.po
index c9534458532964d396b51b41200471c01fe5d380..d0d29bc475cffaa2f429dc31a7527d9a5098f78d 100644
--- a/mail/locale/lv/fusiondirectory.po
+++ b/mail/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr "Grupas pasta iespējas"
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informācija"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/nb/fusiondirectory.po b/mail/locale/nb/fusiondirectory.po
index a25ea1cf07d1d1602fb36d6f0af046ce5b113bd5..b8897d01a2e31cecfe3178082b00b3b7030e6019 100644
--- a/mail/locale/nb/fusiondirectory.po
+++ b/mail/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -282,7 +282,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/nl/fusiondirectory.po b/mail/locale/nl/fusiondirectory.po
index 1dcb2dbb600cbcea493503341747e514ecdd1eb4..8fd71ec81b6dd01086f58f0cdc5c3eadac93523d 100644
--- a/mail/locale/nl/fusiondirectory.po
+++ b/mail/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -282,7 +282,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr "Informatie"
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/pl/fusiondirectory.po b/mail/locale/pl/fusiondirectory.po
index d68f5378032a363b6a1457bcb13ca40b38bbfd48..6ae1054b16991e4ff157937efa79a5aa78ce43d4 100644
--- a/mail/locale/pl/fusiondirectory.po
+++ b/mail/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informacja"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/pt/fusiondirectory.po b/mail/locale/pt/fusiondirectory.po
index 6398ea585cdc925efac145f71589367e7fc822da..7471c2a36bac8a0d0aaa93c78438418769334f10 100644
--- a/mail/locale/pt/fusiondirectory.po
+++ b/mail/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informação"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/pt_BR/fusiondirectory.po b/mail/locale/pt_BR/fusiondirectory.po
index 11e869872a00e3954b03c629d7eaed5589c1a9fd..86f9c203d2a31bb712f80cfae7d16ecf6b51f3d8 100644
--- a/mail/locale/pt_BR/fusiondirectory.po
+++ b/mail/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr "Opção de grupo de e-mail"
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informações"
+msgid "Information"
+msgstr "Informação"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/ru/fusiondirectory.po b/mail/locale/ru/fusiondirectory.po
index 11949991569304aa80e95cb5da809ce985372bae..80ec293f49aef4e9be1c1ab0674e9f7eb8991795 100644
--- a/mail/locale/ru/fusiondirectory.po
+++ b/mail/locale/ru/fusiondirectory.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-24 12:33+0000\n"
-"Last-Translator: Alexey Matveev\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -284,7 +284,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr "Информация"
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/ru@petr1708/fusiondirectory.po b/mail/locale/ru@petr1708/fusiondirectory.po
index 0760ceb7fe16282bdcdc7598d59e8520bba28ed4..dbd0b3aa448abc049fd35345bdc394b9fd3b84c5 100644
--- a/mail/locale/ru@petr1708/fusiondirectory.po
+++ b/mail/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -282,7 +282,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/sv/fusiondirectory.po b/mail/locale/sv/fusiondirectory.po
index 0784b5c47661977012934220b24901bb3477b2c0..ebc8b5a25610a201b0ec17452955950aee4e7840 100644
--- a/mail/locale/sv/fusiondirectory.po
+++ b/mail/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Information"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/ug/fusiondirectory.po b/mail/locale/ug/fusiondirectory.po
index 7d985487f482940da691733a3226b87b0582c31b..29563be8449c5b9583445c96c352e33e49b45efe 100644
--- a/mail/locale/ug/fusiondirectory.po
+++ b/mail/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -282,7 +282,7 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:62
diff --git a/mail/locale/vi_VN/fusiondirectory.po b/mail/locale/vi_VN/fusiondirectory.po
index d876440f57ad2683d664649383a7729e75900c75..eb9a018f1a9f3eeda5896a61d30f387fc213059f 100644
--- a/mail/locale/vi_VN/fusiondirectory.po
+++ b/mail/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Thông tin"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/locale/zh/fusiondirectory.po b/mail/locale/zh/fusiondirectory.po
index 5cfd6c814208892cd86b69957aaedf20314d7b78..60d1c36de1bd1e9ad5ceafb279c487ec999835f5 100644
--- a/mail/locale/zh/fusiondirectory.po
+++ b/mail/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-07-01 14:11+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -282,8 +282,8 @@ msgid "Group mail options"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "提示信息"
 
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "The primary mail address"
diff --git a/mail/personal/mail/class_mailAccount.inc b/mail/personal/mail/class_mailAccount.inc
index e900b2bd4f0b849168182502d653bf82db0691e0..404479e9e73531ca1ea7e2df450acc8c7746789e 100644
--- a/mail/personal/mail/class_mailAccount.inc
+++ b/mail/personal/mail/class_mailAccount.inc
@@ -75,7 +75,7 @@ class mailAccount extends simplePlugin
       'plSelfModify'    => TRUE,
       'plPriority'      => 4,
       'plObjectType'    => array('user'),
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo()),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo()),
       'plForeignKeys'  => array(
         'gosaMailServer' => array(
           array('serverGeneric', 'cn'),
diff --git a/mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc b/mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc
index 5bc7cce7e92f32e0cc1e39a6f979bdcfff154350..b2027d9ef2ad50c0a0be350eb14bf7e277c18da7 100644
--- a/mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc
+++ b/mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc
@@ -35,7 +35,7 @@ class mixedGroup extends simplePlugin
         //~ 'memberUid' => array('user','uid')
       //~ ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/mixedgroups/locale/ar/fusiondirectory.po b/mixedgroups/locale/ar/fusiondirectory.po
index 4d59d3a199ca4bb752ef06265aa785b9c5b027db..e4b8924434696d48ebbe2c6012fea1730c90680c 100644
--- a/mixedgroups/locale/ar/fusiondirectory.po
+++ b/mixedgroups/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/mixedgroups/locale/ca/fusiondirectory.po b/mixedgroups/locale/ca/fusiondirectory.po
index 22ac0f0800804440656f4ccf92abcb12e27fbdbf..14b0e94ce0e974181495c3e91d7470d3f63e8148 100644
--- a/mixedgroups/locale/ca/fusiondirectory.po
+++ b/mixedgroups/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/mixedgroups/locale/cs_CZ/fusiondirectory.po b/mixedgroups/locale/cs_CZ/fusiondirectory.po
index 0712c586813d8fae50b2525e2c2616fb021c8f9c..d1e12747efb1e0ae2aa219333fe16908d03329f6 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/mixedgroups/locale/de/fusiondirectory.po b/mixedgroups/locale/de/fusiondirectory.po
index de36c3478027ff8ad0948f6935e92f4317487112..259fd63d9188cddc617c249083682c6407ab6fab 100644
--- a/mixedgroups/locale/de/fusiondirectory.po
+++ b/mixedgroups/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/mixedgroups/locale/el_GR/fusiondirectory.po b/mixedgroups/locale/el_GR/fusiondirectory.po
index 874a95c44e73eed52cd2612ac526ed6d3fd9ebe6..3aebf5b37c6c67d319f2fd3d7856a3f0d14eda3f 100644
--- a/mixedgroups/locale/el_GR/fusiondirectory.po
+++ b/mixedgroups/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/mixedgroups/locale/en/fusiondirectory.po b/mixedgroups/locale/en/fusiondirectory.po
index b32a89aaeeee7e2f54d7d70859df33ee47c9924f..a5b19639650590e11e88d98ca1637cb9e91e3b89 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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 1d903dff768ff5f1db46609acfe12fa010bb427e..1104f605b4be1dedcc01aad001ad408b6f76f248 100644
--- a/mixedgroups/locale/es/fusiondirectory.po
+++ b/mixedgroups/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/mixedgroups/locale/es_CO/fusiondirectory.po b/mixedgroups/locale/es_CO/fusiondirectory.po
index 7bb2bf543413085b85abd13c5a1037195b59bd1c..358770ceff8015067459bf405daa3d30a46e16eb 100644
--- a/mixedgroups/locale/es_CO/fusiondirectory.po
+++ b/mixedgroups/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/mixedgroups/locale/es_VE/fusiondirectory.po b/mixedgroups/locale/es_VE/fusiondirectory.po
index 8406115af1272e126c7c1c974b759ae7d3fb5bbe..ab5451cb5933e8a6fb29a21bfb1dc741a4663d9b 100644
--- a/mixedgroups/locale/es_VE/fusiondirectory.po
+++ b/mixedgroups/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/mixedgroups/locale/fa_IR/fusiondirectory.po b/mixedgroups/locale/fa_IR/fusiondirectory.po
index 8e132f34b41c62e4199676efc465a1c1c3aa28a3..68d51d1a0990ff9dd5d0f66fe4a9c2c1b6fcfa96 100644
--- a/mixedgroups/locale/fa_IR/fusiondirectory.po
+++ b/mixedgroups/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/mixedgroups/locale/fi_FI/fusiondirectory.po b/mixedgroups/locale/fi_FI/fusiondirectory.po
index 16861773f4106ad16d618b4784134d04646ae8af..ea37d2fc101026e6287adcbf21a45f55858d526a 100644
--- a/mixedgroups/locale/fi_FI/fusiondirectory.po
+++ b/mixedgroups/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/mixedgroups/locale/fr/fusiondirectory.po b/mixedgroups/locale/fr/fusiondirectory.po
index fb532a4a6209e1914466437630034f0816472607..c48c8f7ad4755a05590a879b0a76e787cc69a86e 100644
--- a/mixedgroups/locale/fr/fusiondirectory.po
+++ b/mixedgroups/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/mixedgroups/locale/hu_HU/fusiondirectory.po b/mixedgroups/locale/hu_HU/fusiondirectory.po
index b187c688483bcd7cbb7b2a72d1b63c5aa3f9430a..d5400da211c70b6f4fe338e4bc7273718062122a 100644
--- a/mixedgroups/locale/hu_HU/fusiondirectory.po
+++ b/mixedgroups/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/mixedgroups/locale/id/fusiondirectory.po b/mixedgroups/locale/id/fusiondirectory.po
index fccce6d97bdd44669157d2830e6624376d2730e1..6fd0e2e0ebf26ed4b7110808659a6e3cce33af2b 100644
--- a/mixedgroups/locale/id/fusiondirectory.po
+++ b/mixedgroups/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/mixedgroups/locale/it_IT/fusiondirectory.po b/mixedgroups/locale/it_IT/fusiondirectory.po
index 71746de52c6f9f06f7afc599db8f586fc256772d..ab1c4c0fc99664bf86c4611cea0b3ddf795ff038 100644
--- a/mixedgroups/locale/it_IT/fusiondirectory.po
+++ b/mixedgroups/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 14:39+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/mixedgroups/locale/lv/fusiondirectory.po b/mixedgroups/locale/lv/fusiondirectory.po
index dd161036b5da765a53cae72e86574ad769f3b06b..399d940c6ece35794ad57deb1084572a646ddcc1 100644
--- a/mixedgroups/locale/lv/fusiondirectory.po
+++ b/mixedgroups/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/mixedgroups/locale/nb/fusiondirectory.po b/mixedgroups/locale/nb/fusiondirectory.po
index f87c98337677eef1b9d14d1b582ce30a0d85e5d2..e376c7a3027e7a5dd841c4023e505c8e18dfada5 100644
--- a/mixedgroups/locale/nb/fusiondirectory.po
+++ b/mixedgroups/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/mixedgroups/locale/nl/fusiondirectory.po b/mixedgroups/locale/nl/fusiondirectory.po
index ac1c70eea49a93c2aa309b553960e6011443fa59..07f014320a19059cfa44717efbaa834ffebce378 100644
--- a/mixedgroups/locale/nl/fusiondirectory.po
+++ b/mixedgroups/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/mixedgroups/locale/pl/fusiondirectory.po b/mixedgroups/locale/pl/fusiondirectory.po
index 1119fd6017b7c6075addf36e02dac0a6aae9e413..1e2ca84dd745aa3a1ee48a4599adc006a0a43748 100644
--- a/mixedgroups/locale/pl/fusiondirectory.po
+++ b/mixedgroups/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/mixedgroups/locale/pt/fusiondirectory.po b/mixedgroups/locale/pt/fusiondirectory.po
index 91492be1eb8e76382bb1e0871a427ce05d584da9..b84d370693a9c09ca2e626b75c5f8885a2672a2b 100644
--- a/mixedgroups/locale/pt/fusiondirectory.po
+++ b/mixedgroups/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/mixedgroups/locale/pt_BR/fusiondirectory.po b/mixedgroups/locale/pt_BR/fusiondirectory.po
index 5126fb2c629146107e1e64bd477bf101291544d6..f59602e9a097f055d2e3840b2654725fa5f89244 100644
--- a/mixedgroups/locale/pt_BR/fusiondirectory.po
+++ b/mixedgroups/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/mixedgroups/locale/ru/fusiondirectory.po b/mixedgroups/locale/ru/fusiondirectory.po
index 91af038ec0c568dc30664daf943d67dfa3e38d4b..dff3129739274c6e2f17c401b1bba17406b54144 100644
--- a/mixedgroups/locale/ru/fusiondirectory.po
+++ b/mixedgroups/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-10 07:14+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/mixedgroups/locale/ru@petr1708/fusiondirectory.po b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
index 099a7c34c95374a23f903673ad2549b7bf9b5e6e..564c58aab11c76a99daba79cc0f681aa6d632d02 100644
--- a/mixedgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/mixedgroups/locale/sv/fusiondirectory.po b/mixedgroups/locale/sv/fusiondirectory.po
index 92bef7900cc2267966bbc5421640377ec30557e2..2cab2fe15595884da9bed1387bb4f936846019af 100644
--- a/mixedgroups/locale/sv/fusiondirectory.po
+++ b/mixedgroups/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/mixedgroups/locale/ug/fusiondirectory.po b/mixedgroups/locale/ug/fusiondirectory.po
index 8c104e9889ac8b61b07566e3d0c6732d3cf87d45..de09fac42e66d9439217c3efea25bb058ae2ae67 100644
--- a/mixedgroups/locale/ug/fusiondirectory.po
+++ b/mixedgroups/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/mixedgroups/locale/vi_VN/fusiondirectory.po b/mixedgroups/locale/vi_VN/fusiondirectory.po
index b456ec3a0e99b3079bf9d672c20a441f24d7534b..fa9746650ed8be2b227032e47f03459216a685d9 100644
--- a/mixedgroups/locale/vi_VN/fusiondirectory.po
+++ b/mixedgroups/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/mixedgroups/locale/zh/fusiondirectory.po b/mixedgroups/locale/zh/fusiondirectory.po
index 850c2865ac7a9d7b44a063de04c46304a1ac9cbf..49aa358c71b73d7eac3c5a7acd593963563a2111 100644
--- a/mixedgroups/locale/zh/fusiondirectory.po
+++ b/mixedgroups/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/nagios/config/nagios/class_nagiosConfig.inc b/nagios/config/nagios/class_nagiosConfig.inc
index 07a209a3fc722bef002d10ff770ad969d74b7c95..fd7353153e3bd8a792739c19da7e37adb2f17993 100644
--- a/nagios/config/nagios/class_nagiosConfig.inc
+++ b/nagios/config/nagios/class_nagiosConfig.inc
@@ -31,7 +31,7 @@ class nagiosConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/nagios/locale/ar/fusiondirectory.po b/nagios/locale/ar/fusiondirectory.po
index 2df62a867a869546ae4cc8c4dac2ed3a9d1cddcd..ad1a4917e9ac51cc163b26c8f024ab02ce909317 100644
--- a/nagios/locale/ar/fusiondirectory.po
+++ b/nagios/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/nagios/locale/ca/fusiondirectory.po b/nagios/locale/ca/fusiondirectory.po
index 77683fbc78ee4660aa64d1d2864b86cc6175128c..c1e29458c74a35c6d9ff3fc0721327c8cfa3c123 100644
--- a/nagios/locale/ca/fusiondirectory.po
+++ b/nagios/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/nagios/locale/cs_CZ/fusiondirectory.po b/nagios/locale/cs_CZ/fusiondirectory.po
index 46f625bfb0a72957143e428735ffb357b1d848ce..657903697ab4d6aeaff147e7fd252f3276a22534 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/nagios/locale/de/fusiondirectory.po b/nagios/locale/de/fusiondirectory.po
index 3d60be5b53a8a7179d8605b3f760a4105f1b2ca0..ee6fb43e4988294d29b0f0b901eb1ab246908cd8 100644
--- a/nagios/locale/de/fusiondirectory.po
+++ b/nagios/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/nagios/locale/el_GR/fusiondirectory.po b/nagios/locale/el_GR/fusiondirectory.po
index ad956962cecea43c87d1efcfae3b93ccc789a2f4..611e6aab6b223253e7d0de13cb880054c747532d 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/nagios/locale/en/fusiondirectory.po b/nagios/locale/en/fusiondirectory.po
index 75e9ac671f6dfcce355d1cd25e4eaa2e17488f3b..b7373d898bddcd6c07117d1b221da03e48d8cee2 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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 539bb4db6379a284b818883a51c58c9c4666b759..5f4c43ddb518f4c7ca0354618684a727dcc33457 100644
--- a/nagios/locale/es/fusiondirectory.po
+++ b/nagios/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/nagios/locale/es_CO/fusiondirectory.po b/nagios/locale/es_CO/fusiondirectory.po
index 7d9e29f6b5ece11ef5189e5a4deab6666bb38f15..e4ae750623390f0516e194f7c002ece47ea09803 100644
--- a/nagios/locale/es_CO/fusiondirectory.po
+++ b/nagios/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/nagios/locale/es_VE/fusiondirectory.po b/nagios/locale/es_VE/fusiondirectory.po
index bb4943db3446254ed98695eb20dc1d5c806ceadb..c3f905cc4e1e1c178716db6a2aeacab9d79e57a7 100644
--- a/nagios/locale/es_VE/fusiondirectory.po
+++ b/nagios/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/nagios/locale/fa_IR/fusiondirectory.po b/nagios/locale/fa_IR/fusiondirectory.po
index 90b0eeeac0c0ad9de087cca2a0450f110863db6b..22f54fe544e5600b1b05f0630fd5502826e3ab94 100644
--- a/nagios/locale/fa_IR/fusiondirectory.po
+++ b/nagios/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/nagios/locale/fi_FI/fusiondirectory.po b/nagios/locale/fi_FI/fusiondirectory.po
index 36cb43bba21fad1a1e27825b4dbf8e67175e17a1..a7077ebe071e961ba1468486cfce07a7be04654b 100644
--- a/nagios/locale/fi_FI/fusiondirectory.po
+++ b/nagios/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/nagios/locale/fr/fusiondirectory.po b/nagios/locale/fr/fusiondirectory.po
index 02ea87b9feae6d44bbbac1b7fa921ecd439eac32..6e03be4965787d6a653fe772c8735f206d32e905 100644
--- a/nagios/locale/fr/fusiondirectory.po
+++ b/nagios/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/nagios/locale/hu_HU/fusiondirectory.po b/nagios/locale/hu_HU/fusiondirectory.po
index 1c3e1f92ce3fb24849626f31756d9f6eb570f35c..8d48c7f7d423ebcf61ef6f1b24c771e0bf9123dc 100644
--- a/nagios/locale/hu_HU/fusiondirectory.po
+++ b/nagios/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/nagios/locale/id/fusiondirectory.po b/nagios/locale/id/fusiondirectory.po
index 6565ba8d48f7fdf930805f152d93e9148876fbde..35dfbd7d02d19c0c3b141ab06317cbe768508292 100644
--- a/nagios/locale/id/fusiondirectory.po
+++ b/nagios/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/nagios/locale/it_IT/fusiondirectory.po b/nagios/locale/it_IT/fusiondirectory.po
index de972d294f03fb7d36074e464d8314a223f8ce9b..fe7c649e252031afa8419b1548d3038af32c6d34 100644
--- a/nagios/locale/it_IT/fusiondirectory.po
+++ b/nagios/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/nagios/locale/lv/fusiondirectory.po b/nagios/locale/lv/fusiondirectory.po
index 0bae79956f4b8bdadf41e0bb39ab27f59a905837..8c7d2554c00ed9638d8f6d6010a9eeb53d339ccb 100644
--- a/nagios/locale/lv/fusiondirectory.po
+++ b/nagios/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/nagios/locale/nb/fusiondirectory.po b/nagios/locale/nb/fusiondirectory.po
index 6cfcbe59f5ad9ede597ca68e0ddb009a65ca9638..2354dfc1778f83d2bd931c38543726ad5ea3ab00 100644
--- a/nagios/locale/nb/fusiondirectory.po
+++ b/nagios/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/nagios/locale/nl/fusiondirectory.po b/nagios/locale/nl/fusiondirectory.po
index d9ced838d24510391760b8cdb5283a9af0173530..325d91bbe62894942665dac4d53370a67b61fa40 100644
--- a/nagios/locale/nl/fusiondirectory.po
+++ b/nagios/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/nagios/locale/pl/fusiondirectory.po b/nagios/locale/pl/fusiondirectory.po
index 0d57688f7fc004218b4823c7892310da5cc45d8a..66ee00bb153706d6f85b1abd9d0b6759e080f695 100644
--- a/nagios/locale/pl/fusiondirectory.po
+++ b/nagios/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/nagios/locale/pt/fusiondirectory.po b/nagios/locale/pt/fusiondirectory.po
index 3e257d2a1e3eca8ba7338442906eda5a0bacda2b..81e7d8e8075278c049e7c35cd44077b31be84700 100644
--- a/nagios/locale/pt/fusiondirectory.po
+++ b/nagios/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/nagios/locale/pt_BR/fusiondirectory.po b/nagios/locale/pt_BR/fusiondirectory.po
index 3477b416b232889219cea24fe3ebe4b9aa123e93..771f16bf21393844ad9f0f9f11b65c67c1d9b2ed 100644
--- a/nagios/locale/pt_BR/fusiondirectory.po
+++ b/nagios/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/nagios/locale/ru/fusiondirectory.po b/nagios/locale/ru/fusiondirectory.po
index 98a4ea32f71c8a48a1ea29a52b4fbf657574725e..bcab9ce2e284ccf351f6e8dcd0e52e55c4b20ffb 100644
--- a/nagios/locale/ru/fusiondirectory.po
+++ b/nagios/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/nagios/locale/ru@petr1708/fusiondirectory.po b/nagios/locale/ru@petr1708/fusiondirectory.po
index 0a19a775ecde5420d7ad5b4cfee5abc20505f00d..7f5cecbc86e5e52d31fd38c60addd473690b8f95 100644
--- a/nagios/locale/ru@petr1708/fusiondirectory.po
+++ b/nagios/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/nagios/locale/sv/fusiondirectory.po b/nagios/locale/sv/fusiondirectory.po
index 326f34b0c295f17aea070db2bc1bcffa18e86dc1..72e6dac63f0efb7f13b5239f80152b2f510e5dd0 100644
--- a/nagios/locale/sv/fusiondirectory.po
+++ b/nagios/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/nagios/locale/ug/fusiondirectory.po b/nagios/locale/ug/fusiondirectory.po
index beba28f8c14fcf4882389751419b963fe40491e0..97ffc9b526c64b7e5e07dbf87770b2594923a628 100644
--- a/nagios/locale/ug/fusiondirectory.po
+++ b/nagios/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/nagios/locale/vi_VN/fusiondirectory.po b/nagios/locale/vi_VN/fusiondirectory.po
index b6954d3d3ba519a3c4c76a6fe5b3352456733a4e..f606db7533214d2b2118584789910d9cace0a9d5 100644
--- a/nagios/locale/vi_VN/fusiondirectory.po
+++ b/nagios/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/nagios/locale/zh/fusiondirectory.po b/nagios/locale/zh/fusiondirectory.po
index 6f327082ba750cb0927ffaaf0d751252a3a5b482..66c9ea990aa7720c88c0333181da5c41dd9c852c 100644
--- a/nagios/locale/zh/fusiondirectory.po
+++ b/nagios/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/nagios/personal/nagios/class_nagiosAccount.inc b/nagios/personal/nagios/class_nagiosAccount.inc
index 1532cfdf66cfa38f603c778ecb879f7151c60da9..80c40d32275f36822751958bc4e7d07729c35f17 100644
--- a/nagios/personal/nagios/class_nagiosAccount.inc
+++ b/nagios/personal/nagios/class_nagiosAccount.inc
@@ -45,7 +45,7 @@ class nagiosAccount extends simplePlugin
       'plPriority'    => 7,
       'plObjectType'  => array('user'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -54,7 +54,7 @@ class nagiosAccount extends simplePlugin
    */
   static function getAttributesInfo ()
   {
-    $prefix = self::get_prefix();
+    $prefix = static::get_prefix();
     return array(
       'main' => array(
         'name'  => _('Nagios Account'),
@@ -112,7 +112,7 @@ class nagiosAccount extends simplePlugin
 
   function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
   {
-    $prefix = self::get_prefix();
+    $prefix = static::get_prefix();
     $this->objectclasses = array($prefix.'Contact');
     parent::__construct($dn, $object, $parent, $mainTab);
   }
diff --git a/netgroups/admin/netgroups/class_filterNetGroupLDAP.inc b/netgroups/admin/netgroups/class_filterNetGroupLDAP.inc
deleted file mode 100644
index 8f328e95497d73e0ac777552f2fc11b42235aebb..0000000000000000000000000000000000000000
--- a/netgroups/admin/netgroups/class_filterNetGroupLDAP.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org)
-
-  Copyright (C) 2011 Alejandro Escanero Blanco (aescanero@gmail.com)
-  Copyright (C) 2011-2016  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 filterNetGroupLDAP {
-
-    static function query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage= "") {
-        $result = array();
-        $menu = array();
-        $dn2index = array();
-        $config = session::global_get('config');
-        $ldap = $config->get_ldap_link(TRUE);
-        $flag = ($scope == "sub") ? GL_SUBSEARCH : 0;
-        $tmp = filterNetGroupLDAP::get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT);
-
-        // Sort out menu entries, but save info
-        $index = 0;
-        foreach ($tmp as $entry) {
-            if (in_array_ics("nisNetgroup", $entry['objectClass'])) {
-                $result[$index] = $entry;
-                $dn2index[$entry['dn']] = $index;
-                $index++;
-            } else {
-                foreach ($objectStorage as $storage) {
-                    $group = preg_replace("/^.*,([^,]+)," . preg_quote("$storage$base") . "$/", '$1', $entry['dn']);
-                    $group = "$group,$storage$base";
-
-                    // The current group implementation has no multiple storage settings - so break here
-                    break;
-                }
-                $menu[$group] = true;
-            }
-        }
-
-        // Move menu information to menu
-        foreach ($menu as $dn => $dummy) {
-            if (isset($dn2index[$dn])) {
-                $result[$dn2index[$dn]]["objectClass"][] = "gotoMenuGroup";
-            }
-        }
-
-        return $result;
-    }
-
-    static function get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH) {
-        return filterLDAP::get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $flags);
-    }
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-
-?>
diff --git a/netgroups/admin/netgroups/class_netgroup.inc b/netgroups/admin/netgroups/class_netgroup.inc
index edda80f8b653ec6adcf32428aee879ae331d3bf1..171cde65e3939c7a67dca0d5fc1bfc693db17603 100644
--- a/netgroups/admin/netgroups/class_netgroup.inc
+++ b/netgroups/admin/netgroups/class_netgroup.inc
@@ -57,7 +57,7 @@ class netgroup extends simplePlugin
         'icon'    => 'geticon.php?context=applications&icon=netgroups&size=16'
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -66,7 +66,7 @@ class netgroup extends simplePlugin
   {
     return array(
       'main' => array(
-        'name'  => _('Informations'),
+        'name'  => _('Information'),
         'attrs' => array(
           new HostNameAttribute(
             _('Name'), _('Name of this NIS netgroup'), 'cn'
diff --git a/netgroups/admin/systems/netgroups/class_netgroupSystem.inc b/netgroups/admin/systems/netgroups/class_netgroupSystem.inc
index 2fd63158a5ce609259071f1b83e69fcdac39aa0b..180a9506b56a614609fd9e88f7205a60fe113413 100644
--- a/netgroups/admin/systems/netgroups/class_netgroupSystem.inc
+++ b/netgroups/admin/systems/netgroups/class_netgroupSystem.inc
@@ -26,9 +26,9 @@ class netgroupSystem extends netgroupMembership {
       'plShortName'     => _('NIS Netgroup'),
       'plDescription'   => _('NIS Netgroup member'),
       'plSelfModify'    => FALSE,
-      'plPriority'      => 2,
+      'plPriority'      => 3,
       'plObjectType'    => array('workstation','terminal','server','printer'),
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/netgroups/config/netgroups/class_netgroupConfig.inc b/netgroups/config/netgroups/class_netgroupConfig.inc
index 1df090b99910b0872aad0e5e02a9eee89226dd49..02d4aa5e388dda6be3da5bd5052cadc3323ef657 100644
--- a/netgroups/config/netgroups/class_netgroupConfig.inc
+++ b/netgroups/config/netgroups/class_netgroupConfig.inc
@@ -31,7 +31,7 @@ class netgroupConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/netgroups/locale/ar/fusiondirectory.po b/netgroups/locale/ar/fusiondirectory.po
index 024075444e7a0cc498c74ea1cd5d7f3683a1e230..90d103a0f46a6c61e4db032f969e5b6498419c99 100644
--- a/netgroups/locale/ar/fusiondirectory.po
+++ b/netgroups/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "معلومات"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/ca/fusiondirectory.po b/netgroups/locale/ca/fusiondirectory.po
index 53e4a1296553620017d683a72ace5cba9dd959c5..bf3388db001845aee9060e7a49d4e19554b0b6a9 100644
--- a/netgroups/locale/ca/fusiondirectory.po
+++ b/netgroups/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informació"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/cs_CZ/fusiondirectory.po b/netgroups/locale/cs_CZ/fusiondirectory.po
index 68dcef586fd13a919ca4d54523e4209bd507c61b..91f4fede68ca8034e95048812204f31e029461d5 100644
--- a/netgroups/locale/cs_CZ/fusiondirectory.po
+++ b/netgroups/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr "Nastavení síťové skupiny v NIS"
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr "Informace"
+msgid "Information"
+msgstr "informace"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/de/fusiondirectory.po b/netgroups/locale/de/fusiondirectory.po
index b5ae0854022c1b4db4454d3e89c1e2fad0879b11..1178658659ff9df2c68702bea57a0aae66d885f0 100644
--- a/netgroups/locale/de/fusiondirectory.po
+++ b/netgroups/locale/de/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -63,8 +63,8 @@ msgid "NIS Netgroup settings"
 msgstr "NIS-Netzgruppeneinstellungen"
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr "Informationen"
+msgid "Information"
+msgstr "Information"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/el_GR/fusiondirectory.po b/netgroups/locale/el_GR/fusiondirectory.po
index c406269326cc42a7111f793148913ff2d7121834..37d3905737b035e17bdf91112246308da57e185f 100644
--- a/netgroups/locale/el_GR/fusiondirectory.po
+++ b/netgroups/locale/el_GR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgid "NIS Netgroup settings"
 msgstr "Ρυθμίσεις NIS Netgroup"
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr "Πληροφορίες"
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/en/fusiondirectory.po b/netgroups/locale/en/fusiondirectory.po
index 2a8620deac02879016ec86788563caa556e8e671..9909fe57d1d67292406bf3e9c2b5bde3be4f8bb7 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,23 +17,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:72
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/es/fusiondirectory.po b/netgroups/locale/es/fusiondirectory.po
index 63bde00fae15b65edb9b4119121cfad812d9e467..7f6a0b6e7a633d907c5a85436f0eadba2744eaa9 100644
--- a/netgroups/locale/es/fusiondirectory.po
+++ b/netgroups/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 17:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Información"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/es_CO/fusiondirectory.po b/netgroups/locale/es_CO/fusiondirectory.po
index 6457105c617b58f80724e9353eef7ba97ef54982..6c3da789872439f0f4ebb82c898b9f46be58e960 100644
--- a/netgroups/locale/es_CO/fusiondirectory.po
+++ b/netgroups/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr "Datos"
+msgid "Information"
+msgstr "Información"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/es_VE/fusiondirectory.po b/netgroups/locale/es_VE/fusiondirectory.po
index 1a5f698dbc3982b7cb51ccc3af37c06ba3592dc3..61da6b237b415b08a23273aec8040ca4f6e3df84 100644
--- a/netgroups/locale/es_VE/fusiondirectory.po
+++ b/netgroups/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Información"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/fa_IR/fusiondirectory.po b/netgroups/locale/fa_IR/fusiondirectory.po
index af709bc50a635ac3bcc81884799e9ffb3e9f6704..78a261b6fcec8bc0b3900dd393f67c5ce24020a0 100644
--- a/netgroups/locale/fa_IR/fusiondirectory.po
+++ b/netgroups/locale/fa_IR/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:52+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/fi_FI/fusiondirectory.po b/netgroups/locale/fi_FI/fusiondirectory.po
index 1ffb0a2cbe809e525e8fb24404a2877c651c6193..f8e3a506376af4c8103b26d512495a0a14719ec0 100644
--- a/netgroups/locale/fi_FI/fusiondirectory.po
+++ b/netgroups/locale/fi_FI/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:52+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/fr/fusiondirectory.po b/netgroups/locale/fr/fusiondirectory.po
index 4e5e83d4c50b096bc2bdd852faf00013e449ef4f..3221609f9c3d53c4c305deadce19515793ed6e35 100644
--- a/netgroups/locale/fr/fusiondirectory.po
+++ b/netgroups/locale/fr/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -63,8 +63,8 @@ msgid "NIS Netgroup settings"
 msgstr "Paramètres des groupes NIS"
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr "Informations"
+msgid "Information"
+msgstr "Information"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/hu_HU/fusiondirectory.po b/netgroups/locale/hu_HU/fusiondirectory.po
index 8287e875e87122a8e10cca2c08d35b0ca8a7f276..cf7d99547c7e865398378698faca3e1dec2d44d4 100644
--- a/netgroups/locale/hu_HU/fusiondirectory.po
+++ b/netgroups/locale/hu_HU/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:52+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/id/fusiondirectory.po b/netgroups/locale/id/fusiondirectory.po
index 14dcb317a8c472189c66c2794101d610ac859e03..b286120610f813df2b2db26d771643fb88db907b 100644
--- a/netgroups/locale/id/fusiondirectory.po
+++ b/netgroups/locale/id/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:52+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/it_IT/fusiondirectory.po b/netgroups/locale/it_IT/fusiondirectory.po
index 1dee917d44469b2325af621b4d1716953f046212..8f05ee17176c6f42fd6568384e00f4fbb8f5da16 100644
--- a/netgroups/locale/it_IT/fusiondirectory.po
+++ b/netgroups/locale/it_IT/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:25+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -64,8 +64,8 @@ msgid "NIS Netgroup settings"
 msgstr "Impostazioni gruppo NIS"
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr "Informazioni"
+msgid "Information"
+msgstr "Informazione"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/lv/fusiondirectory.po b/netgroups/locale/lv/fusiondirectory.po
index 4c0839e651e66e0ea875351d04710b4f5a509d8c..8a34a810961342f0e8eb8149ba93295a599a77e9 100644
--- a/netgroups/locale/lv/fusiondirectory.po
+++ b/netgroups/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informācija"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/nb/fusiondirectory.po b/netgroups/locale/nb/fusiondirectory.po
index a7a28299dd5810321269843f24451b6fa3d26d9e..72bd0cd81bc8d251a7d7d7ec4ead9c74c774297a 100644
--- a/netgroups/locale/nb/fusiondirectory.po
+++ b/netgroups/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/nl/fusiondirectory.po b/netgroups/locale/nl/fusiondirectory.po
index a57a5b5b23af6062359efd8275ba004752ee42f5..7b267d76afd782b66e5c9705aa6493b0a8b3c1c1 100644
--- a/netgroups/locale/nl/fusiondirectory.po
+++ b/netgroups/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr "Informatie"
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/pl/fusiondirectory.po b/netgroups/locale/pl/fusiondirectory.po
index c4f8d822ce4b213c33017dbde339f6e59ff07d24..382f24a33facb80645b762cb5d0e54bafaf34828 100644
--- a/netgroups/locale/pl/fusiondirectory.po
+++ b/netgroups/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informacja"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/pt/fusiondirectory.po b/netgroups/locale/pt/fusiondirectory.po
index 6502f74212f5f9d2caf3500ca51ed06059c83d00..6dcf9da799b7314b46ffede662db3a00e273f3b3 100644
--- a/netgroups/locale/pt/fusiondirectory.po
+++ b/netgroups/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informação"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/pt_BR/fusiondirectory.po b/netgroups/locale/pt_BR/fusiondirectory.po
index 72cdd70e8d2d2d1c0c552d9fa1eb21b60159aa55..474adc5bd560a23626318103e37486dc33179b86 100644
--- a/netgroups/locale/pt_BR/fusiondirectory.po
+++ b/netgroups/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr "Informações"
+msgid "Information"
+msgstr "Informação"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/ru/fusiondirectory.po b/netgroups/locale/ru/fusiondirectory.po
index ad2ccffc079feaf98eff22fdabb42f64c9a75fe2..72a26a98540eb280492804eef6a16e752436e317 100644
--- a/netgroups/locale/ru/fusiondirectory.po
+++ b/netgroups/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-08 09:58+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr "Информация"
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/ru@petr1708/fusiondirectory.po b/netgroups/locale/ru@petr1708/fusiondirectory.po
index 5201f0dfe33a884d438c15c297e5da1cbac5f922..8e48381441447dba05c979da45cf8912aeab74e7 100644
--- a/netgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/netgroups/locale/ru@petr1708/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:52+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/sv/fusiondirectory.po b/netgroups/locale/sv/fusiondirectory.po
index 6c99d2226bb1bf466d5b700f051b3770860eb302..b8defa69c0a18eb116e969312c9f0f2f96495824 100644
--- a/netgroups/locale/sv/fusiondirectory.po
+++ b/netgroups/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Information"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/ug/fusiondirectory.po b/netgroups/locale/ug/fusiondirectory.po
index 3c3393e596284bed1a53bba8955577000ed60061..e7ef64c46fbda421423b5ebf36f604c7ed7cf8f1 100644
--- a/netgroups/locale/ug/fusiondirectory.po
+++ b/netgroups/locale/ug/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:52+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:72
diff --git a/netgroups/locale/vi_VN/fusiondirectory.po b/netgroups/locale/vi_VN/fusiondirectory.po
index 11372195867eaf8241a2a83851510e3f42ce56ac..11c4e14d9057807d1d0df479a617c89368651274 100644
--- a/netgroups/locale/vi_VN/fusiondirectory.po
+++ b/netgroups/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Thông tin"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/locale/zh/fusiondirectory.po b/netgroups/locale/zh/fusiondirectory.po
index aa361d7a81e8613e0ec542f6a07e80ff7367f30e..2e9a149692e46bb29940675cf23a22d334bdd4fd 100644
--- a/netgroups/locale/zh/fusiondirectory.po
+++ b/netgroups/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,8 @@ msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "提示信息"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
diff --git a/netgroups/personal/netgroups/class_netgroupMembership.inc b/netgroups/personal/netgroups/class_netgroupMembership.inc
index 5a0d3bb37c94e253f6c828afbc5cb8667abed81e..20e298a97c745f9558d165c8ca5022dd161b6b06 100644
--- a/netgroups/personal/netgroups/class_netgroupMembership.inc
+++ b/netgroups/personal/netgroups/class_netgroupMembership.inc
@@ -48,7 +48,7 @@ class netgroupMembership extends simplePlugin {
       'plPriority'      => 13,
       'plObjectType'    => array('user'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/newsletter/config/newsletter/class_newsletterConfig.inc b/newsletter/config/newsletter/class_newsletterConfig.inc
index 804e5b60ce7a96ad722f8415fac96185d552f189..37e59753f7c5a745f75b06df0d3626a1efca3380 100644
--- a/newsletter/config/newsletter/class_newsletterConfig.inc
+++ b/newsletter/config/newsletter/class_newsletterConfig.inc
@@ -30,7 +30,7 @@ class newsletterConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/newsletter/locale/ar/fusiondirectory.po b/newsletter/locale/ar/fusiondirectory.po
index 04dc16515dc54fff68aad7de498bc09fd0e70d43..c7d59adb4baefef7d0ff5b68db453effb727733d 100644
--- a/newsletter/locale/ar/fusiondirectory.po
+++ b/newsletter/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/newsletter/locale/ca/fusiondirectory.po b/newsletter/locale/ca/fusiondirectory.po
index 712929cb79f05f1e3911765bbc82ec1795166b81..bf9a1fba9f32348667d392138df1b1448228aeb4 100644
--- a/newsletter/locale/ca/fusiondirectory.po
+++ b/newsletter/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/newsletter/locale/cs_CZ/fusiondirectory.po b/newsletter/locale/cs_CZ/fusiondirectory.po
index 5ca3bba97ee2d7d07700d4b47eccffaa7e398dc3..df3cb245a2308272dcf6c79b37c4c5291099dadc 100644
--- a/newsletter/locale/cs_CZ/fusiondirectory.po
+++ b/newsletter/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/newsletter/locale/de/fusiondirectory.po b/newsletter/locale/de/fusiondirectory.po
index 02899d4fc318bb913a306d2610815a653083c277..e1543b195ec25501891759fb33480f549be0b4f4 100644
--- a/newsletter/locale/de/fusiondirectory.po
+++ b/newsletter/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/newsletter/locale/el_GR/fusiondirectory.po b/newsletter/locale/el_GR/fusiondirectory.po
index 1147d234aa58dfe3138591fbe5c333aca83cb44a..361cefc84a745cf8c1e7c94641fc71cd63ed22fd 100644
--- a/newsletter/locale/el_GR/fusiondirectory.po
+++ b/newsletter/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/newsletter/locale/en/fusiondirectory.po b/newsletter/locale/en/fusiondirectory.po
index 4d0104a0cbc02e6e06e4870e99655f63db6480ee..63cadecca1f99db234a08e95fa4103a78d4dbde7 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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 12fad584ac3b3c324f91304345fbc0c512c62e29..5398c962805855d9683bc1d905b6dba997841095 100644
--- a/newsletter/locale/es/fusiondirectory.po
+++ b/newsletter/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/newsletter/locale/es_CO/fusiondirectory.po b/newsletter/locale/es_CO/fusiondirectory.po
index fda6148d367dcb8d7a68071f6eca055054828462..a99e40dc33230bace0471b2a5d21402fd2ae7794 100644
--- a/newsletter/locale/es_CO/fusiondirectory.po
+++ b/newsletter/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/newsletter/locale/es_VE/fusiondirectory.po b/newsletter/locale/es_VE/fusiondirectory.po
index ac4660465c67ab1a8c96ab9728e8b1696cb95a5d..356426ac2c8b07af94dd8041c17cfb5ca5f30357 100644
--- a/newsletter/locale/es_VE/fusiondirectory.po
+++ b/newsletter/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/newsletter/locale/fa_IR/fusiondirectory.po b/newsletter/locale/fa_IR/fusiondirectory.po
index 0c4977f8deadf4f3a4d49b5c5a9c5a80338e2c93..872e095e50a835dfda0d0eec45cf1b061e2d2daa 100644
--- a/newsletter/locale/fa_IR/fusiondirectory.po
+++ b/newsletter/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/newsletter/locale/fi_FI/fusiondirectory.po b/newsletter/locale/fi_FI/fusiondirectory.po
index 1fd0af3e3ca364cb115d3ddd8af3709dfac07604..3e698fc39686fb4d858f9316f6350f652c1a921f 100644
--- a/newsletter/locale/fi_FI/fusiondirectory.po
+++ b/newsletter/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/newsletter/locale/fr/fusiondirectory.po b/newsletter/locale/fr/fusiondirectory.po
index a2c7c93f8303058d588ced45be6da2f3458dcfe9..1aaa823b639bf8b59a2c264b779ffebb27abfb73 100644
--- a/newsletter/locale/fr/fusiondirectory.po
+++ b/newsletter/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:27+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/newsletter/locale/hu_HU/fusiondirectory.po b/newsletter/locale/hu_HU/fusiondirectory.po
index 0c5002c5070fd18ca46ac73de52b6af80eaf9393..59bdb676d601d550486de655200318fcc34ce245 100644
--- a/newsletter/locale/hu_HU/fusiondirectory.po
+++ b/newsletter/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/newsletter/locale/id/fusiondirectory.po b/newsletter/locale/id/fusiondirectory.po
index 7c188ab4494da66fb9c4e29b370b3b21978e8123..d0006a62335ebcfdca54629463915151c89d60f9 100644
--- a/newsletter/locale/id/fusiondirectory.po
+++ b/newsletter/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/newsletter/locale/it_IT/fusiondirectory.po b/newsletter/locale/it_IT/fusiondirectory.po
index a470d7b9ffbe4e8f93bb7cd53c52f6f7859927f6..482e83af160590f3a7accbd4519c5f4e6169c99f 100644
--- a/newsletter/locale/it_IT/fusiondirectory.po
+++ b/newsletter/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:58+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/newsletter/locale/lv/fusiondirectory.po b/newsletter/locale/lv/fusiondirectory.po
index 3266d1c062350f1d72a185e4a7bfd78e5038cb14..5949b86d7e6d781d4e01992c3b2a1f9ecdecf9c4 100644
--- a/newsletter/locale/lv/fusiondirectory.po
+++ b/newsletter/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/newsletter/locale/nb/fusiondirectory.po b/newsletter/locale/nb/fusiondirectory.po
index a0a8abb546f841c0b5bbd63e714cbafc8325e760..9edd61869baab24f2f1c509d1d33f039553a783b 100644
--- a/newsletter/locale/nb/fusiondirectory.po
+++ b/newsletter/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/newsletter/locale/nl/fusiondirectory.po b/newsletter/locale/nl/fusiondirectory.po
index e2868603026a231a94b23c4130c98a518012f64e..aaa8e6072ac59333995d86bac8209499fc3dcaea 100644
--- a/newsletter/locale/nl/fusiondirectory.po
+++ b/newsletter/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/newsletter/locale/pl/fusiondirectory.po b/newsletter/locale/pl/fusiondirectory.po
index f7bfde0f8f2b1b947e41802345e9193e92c36f7a..5d739115419a71eae4b40f5048085d9d8c3ddf28 100644
--- a/newsletter/locale/pl/fusiondirectory.po
+++ b/newsletter/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/newsletter/locale/pt/fusiondirectory.po b/newsletter/locale/pt/fusiondirectory.po
index 43afbe2f905c4a1473a34533b09ce1636eba66a4..12967f47e9a78f592edfc6c2a2b84875c0cf37f9 100644
--- a/newsletter/locale/pt/fusiondirectory.po
+++ b/newsletter/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/newsletter/locale/pt_BR/fusiondirectory.po b/newsletter/locale/pt_BR/fusiondirectory.po
index 11b6dcf8f07f75266497dc25edf4f4a9e6851356..1d5202ecfbc27fcc74d8f3cc685e4ed0fe3fbbe9 100644
--- a/newsletter/locale/pt_BR/fusiondirectory.po
+++ b/newsletter/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/newsletter/locale/ru/fusiondirectory.po b/newsletter/locale/ru/fusiondirectory.po
index 58188f7a48ab57cc379562df00d41dbeb4e76c43..2c74af56df956ea8f80eea6f5bc22b17b0c3f74d 100644
--- a/newsletter/locale/ru/fusiondirectory.po
+++ b/newsletter/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/newsletter/locale/ru@petr1708/fusiondirectory.po b/newsletter/locale/ru@petr1708/fusiondirectory.po
index 337bd0ce5aacc0c9a6a5cd4f4b445584fde01929..79e16ccd6a73296d9acf84dff18c1e944ee049b7 100644
--- a/newsletter/locale/ru@petr1708/fusiondirectory.po
+++ b/newsletter/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/newsletter/locale/sv/fusiondirectory.po b/newsletter/locale/sv/fusiondirectory.po
index 01036ce4825d08b056309d5a99b785d62601040a..9daf722b3adc2512eb80fb549bd63f0f05b7b07a 100644
--- a/newsletter/locale/sv/fusiondirectory.po
+++ b/newsletter/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/newsletter/locale/ug/fusiondirectory.po b/newsletter/locale/ug/fusiondirectory.po
index a0341d8e45a1002d765d8ef26106bc0eb7ea5381..305dcc2f10c64cedcc71e61913b48a773444b76c 100644
--- a/newsletter/locale/ug/fusiondirectory.po
+++ b/newsletter/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/newsletter/locale/vi_VN/fusiondirectory.po b/newsletter/locale/vi_VN/fusiondirectory.po
index a2a0768c767fc8dbbbd1cee55cfffda88d70be7d..1b4c44da95a0000414acdee5618e47ba76468a5e 100644
--- a/newsletter/locale/vi_VN/fusiondirectory.po
+++ b/newsletter/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/newsletter/locale/zh/fusiondirectory.po b/newsletter/locale/zh/fusiondirectory.po
index 257f5efba6c37f6f3a7d1d778993342c51338e2d..902edfdc43460f5fc685a8bb4bdfb4b447e1ee83 100644
--- a/newsletter/locale/zh/fusiondirectory.po
+++ b/newsletter/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/newsletter/personal/newsletter/class_newsletterSubscriptions.inc b/newsletter/personal/newsletter/class_newsletterSubscriptions.inc
index c28664103a9effab63934ec3dcab242e62371153..495c3c3d57e5b9b9e955dfff78e61155f25c1853 100644
--- a/newsletter/personal/newsletter/class_newsletterSubscriptions.inc
+++ b/newsletter/personal/newsletter/class_newsletterSubscriptions.inc
@@ -34,7 +34,7 @@ class newsletterSubscriptions extends simplePlugin
       'plIcon'          => 'geticon.php?context=applications&icon=newsletter&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=newsletter&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/opsi/addons/opsi/class_opsiImport.inc b/opsi/addons/opsi/class_opsiImport.inc
index 34db5c2bf79d0b4149e840273fa8f1694ddc028b..34c8c75f5fae6c6876744c5699ad19a86d14c5e7 100644
--- a/opsi/addons/opsi/class_opsiImport.inc
+++ b/opsi/addons/opsi/class_opsiImport.inc
@@ -23,7 +23,7 @@ class opsiImport extends systemImport
 {
   protected $defaultType = 'winstation';
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling  */
   static function plInfo()
   {
     return array(
@@ -41,7 +41,7 @@ class opsiImport extends systemImport
       'plSection'     => 'conf',
       'plPriority'    => 15,
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -92,7 +92,7 @@ class opsiImport extends systemImport
     $res = $s_daemon->append_call("OPSI.host_getObjects", array($macAddress), array('args' => array(array(), array('type' => 'OpsiClient'))));
     if ($s_daemon->is_error()) {
       msg_dialog::display(
-        _("Could not update OPSI informations"),
+        _("Could not update OPSI information"),
         msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
       );
       return FALSE;
diff --git a/opsi/admin/opsi/class_opsiOnDemandList.inc b/opsi/admin/opsi/class_opsiOnDemandList.inc
index 3efb3559f91e169206c24db4afd165d03adfc73c..066b547c0931736a62f1af1abfd432a1a00dbe77 100644
--- a/opsi/admin/opsi/class_opsiOnDemandList.inc
+++ b/opsi/admin/opsi/class_opsiOnDemandList.inc
@@ -36,7 +36,7 @@ class opsiOnDemandList extends opsiSoftwareList
         'icon'    => 'geticon.php?context=applications&icon=opsi-on-demand&size=16',
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/opsi/admin/opsi/class_opsiProductProperties.inc b/opsi/admin/opsi/class_opsiProductProperties.inc
index 2402f65f9438d82e0a0c7b827994c1bf4085ca2d..e4e01c0baa9c4533d52e125118f4c38a0530ae43 100644
--- a/opsi/admin/opsi/class_opsiProductProperties.inc
+++ b/opsi/admin/opsi/class_opsiProductProperties.inc
@@ -106,7 +106,7 @@ class opsiProductProperties extends simplePlugin
       'plSelfModify'  => FALSE,
       'plObjectType'  => array('opsiProfile'),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/opsi/admin/opsi/class_opsiProfile.inc b/opsi/admin/opsi/class_opsiProfile.inc
index 291e6b0dcea1f091e91c51a498a633d45150f7eb..7fc51f354a84b0eb6c24fca8f711fedc5adff93d 100644
--- a/opsi/admin/opsi/class_opsiProfile.inc
+++ b/opsi/admin/opsi/class_opsiProfile.inc
@@ -75,7 +75,7 @@ class opsiProfile extends simplePlugin
         'icon'    => 'geticon.php?context=applications&icon=opsi&size=16',
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/opsi/admin/opsi/class_opsiProfileManagement.inc b/opsi/admin/opsi/class_opsiProfileManagement.inc
index c703be03be7820ece57d98c26df2a29ba2d9f26d..5a0f7fe1721a653181506d29eb54277019229d76 100644
--- a/opsi/admin/opsi/class_opsiProfileManagement.inc
+++ b/opsi/admin/opsi/class_opsiProfileManagement.inc
@@ -26,7 +26,7 @@ class opsiManagement extends simpleManagement
   protected $departmentRootVisible  = FALSE;
   protected $baseMode               = FALSE;
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
diff --git a/opsi/admin/opsi/class_opsiSoftwareList.inc b/opsi/admin/opsi/class_opsiSoftwareList.inc
index 9bac6c696abcae49b6aefefddc199e2aec8b2f30..c65b3f26971b2792f55c4aab409aaf11acc45ddb 100644
--- a/opsi/admin/opsi/class_opsiSoftwareList.inc
+++ b/opsi/admin/opsi/class_opsiSoftwareList.inc
@@ -40,7 +40,7 @@ class opsiSoftwareList extends simplePlugin
         'icon'    => 'geticon.php?context=applications&icon=opsi-software-list&size=16',
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/opsi/admin/systems/opsi/class_opsiClient.inc b/opsi/admin/systems/opsi/class_opsiClient.inc
index 2af1c9688b904942cc256cfe93a2aa8a5a607ab0..18a091d84efbeb3b2db56bdbc0e03f7c28df6374 100644
--- a/opsi/admin/systems/opsi/class_opsiClient.inc
+++ b/opsi/admin/systems/opsi/class_opsiClient.inc
@@ -35,7 +35,7 @@ class opsiClient extends simplePlugin
       'plSelfModify'  => FALSE,
       'plObjectType'  => array('winstation', 'ogroup-dynamic'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -102,7 +102,7 @@ class opsiClient extends simplePlugin
           $s_daemon->append_call('OPSI.delete', array($serverMac), array('args' => array($macAddresses)));
           if ($s_daemon->is_error()) {
             msg_dialog::display(
-              _('Could not remove OPSI informations'),
+              _('Could not remove OPSI information'),
               msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
             );
           }
@@ -147,7 +147,7 @@ class opsiClient extends simplePlugin
       $res = $s_daemon->append_call('OPSI.update_or_insert', $macAddresses, array());
       if ($s_daemon->is_error()) {
         msg_dialog::display(
-          _('Could not update OPSI informations'),
+          _('Could not update OPSI information'),
           msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
         );
       }
@@ -157,7 +157,7 @@ class opsiClient extends simplePlugin
   function remove_from_parent()
   {
     if ($this->member_of_group) {
-      // If the winstation is member of an ogroup which has OPSI activated, we must update_or_insert informations
+      // 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();
     }
@@ -190,7 +190,7 @@ class opsiClient extends simplePlugin
         $res = $s_daemon->append_call('OPSI.delete', $macAddresses, array());
         if ($s_daemon->is_error()) {
           msg_dialog::display(
-            _('Could not remove OPSI informations'),
+            _('Could not remove OPSI information'),
             msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
           );
         }
diff --git a/opsi/admin/systems/services/opsi/class_serviceOPSI.inc b/opsi/admin/systems/services/opsi/class_serviceOPSI.inc
index 3dad5a9111c3d27c2dfba7ec448dc2c8f122ea73..0b7b8f5e7ccc65587b37313ea34ac928205cc934 100644
--- a/opsi/admin/systems/services/opsi/class_serviceOPSI.inc
+++ b/opsi/admin/systems/services/opsi/class_serviceOPSI.inc
@@ -22,7 +22,7 @@ class serviceOPSI extends simpleService
 {
   var $objectclasses = array('opsiServer');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -30,7 +30,7 @@ class serviceOPSI extends simpleService
       'plDescription' => _('OPSI service').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=applications&icon=opsi&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -38,7 +38,7 @@ class serviceOPSI extends simpleService
   {
     return array(
       'main' => array(
-        'name'      => _('OPSI Server informations'),
+        'name'      => _('OPSI Server information'),
         'attrs'     => array(
           new StringAttribute(
             _('Server URI'), _('The URI to use for connection'),
diff --git a/opsi/config/opsi/class_opsiConfig.inc b/opsi/config/opsi/class_opsiConfig.inc
index b60ba76e3dcf9ab7db4bad2830e351accfe6c775..de73b16e24dbabc652ec79e9989564d39671d001 100644
--- a/opsi/config/opsi/class_opsiConfig.inc
+++ b/opsi/config/opsi/class_opsiConfig.inc
@@ -31,7 +31,7 @@ class opsiConfig extends simplePlugin
       'plCategory'    => array('configuration'),
       'plObjectType'  => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/opsi/locale/ar/fusiondirectory.po b/opsi/locale/ar/fusiondirectory.po
index 0952caf47bfc2cdac254b42ce1d8fb8f28c78d09..55e5950acbaf126f06ee1791effae37cc9a5ab9b 100644
--- a/opsi/locale/ar/fusiondirectory.po
+++ b/opsi/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "خدمات"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/ca/fusiondirectory.po b/opsi/locale/ca/fusiondirectory.po
index 226bea4df7bfd8685ddc32b6e3222e1a74e8dc6e..6e9d414db5cef3d6fbe3a91ab7cac74b91b8a3e4 100644
--- a/opsi/locale/ca/fusiondirectory.po
+++ b/opsi/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/cs_CZ/fusiondirectory.po b/opsi/locale/cs_CZ/fusiondirectory.po
index 0be6923404333989b2b4e845e55d16ecfcf48aa9..b02db9a96e80406032e8a88b0719c2d84e233dcb 100644
--- a/opsi/locale/cs_CZ/fusiondirectory.po
+++ b/opsi/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgstr "Žádná MAC adresa"
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
-msgstr "Nelze aktualizovat OPSI informace"
+msgid "Could not update OPSI information"
+msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
@@ -236,8 +236,8 @@ msgstr "Nelze zjistit macAddress pro OPSI server !"
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
-msgstr "OPSI informace nelze odebrat"
+msgid "Could not remove OPSI information"
+msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
@@ -249,8 +249,8 @@ msgid "Services"
 msgstr "Služby"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
-msgstr "Informace o OPSI serveru"
+msgid "OPSI Server information"
+msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "Server URI"
diff --git a/opsi/locale/de/fusiondirectory.po b/opsi/locale/de/fusiondirectory.po
index 62d60b1bb5d31e68e0c84c39e8355e84b48ba3aa..3986b7946896ac4a64f03c3fb39f0aa44526e89d 100644
--- a/opsi/locale/de/fusiondirectory.po
+++ b/opsi/locale/de/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -38,8 +38,8 @@ msgstr "Keine MAC-Adresse"
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
-msgstr "Konnte die OPSI-Informationen nicht aktualisieren"
+msgid "Could not update OPSI information"
+msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
@@ -237,8 +237,8 @@ msgstr "Konnte die MAC-Adresse des OPSI-Servers nicht finden !"
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
-msgstr "Konnte die OPSI-Informationen nicht löschen"
+msgid "Could not remove OPSI information"
+msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
@@ -250,8 +250,8 @@ msgid "Services"
 msgstr "Dienste"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
-msgstr "OPSI-Serverinformationen"
+msgid "OPSI Server information"
+msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "Server URI"
diff --git a/opsi/locale/el_GR/fusiondirectory.po b/opsi/locale/el_GR/fusiondirectory.po
index 82c7372afacec4627e3765635fce829509e07676..89172fef2f94c46c09cf87db1a7e518d34f23285 100644
--- a/opsi/locale/el_GR/fusiondirectory.po
+++ b/opsi/locale/el_GR/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgstr "Δεν υπάρχει διεύθυνση MAC"
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
-msgstr "Αδύνατη η ενημέρωση των πληροφοριών OPSI"
+msgid "Could not update OPSI information"
+msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
@@ -238,8 +238,8 @@ msgstr "Αδύνατη η λήψη της διεύθυνσης MAC για τον
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
-msgstr "Αδύνατη η διαγραφή των πληροφοριών OPSI"
+msgid "Could not remove OPSI information"
+msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
@@ -251,8 +251,8 @@ msgid "Services"
 msgstr "Υπηρεσίες"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
-msgstr "Πληροφορίες του διακομιστή OPSI"
+msgid "OPSI Server information"
+msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "Server URI"
diff --git a/opsi/locale/en/fusiondirectory.po b/opsi/locale/en/fusiondirectory.po
index f86c8f36c4640630f6a0c8b9cad09e94095faf3f..44136199ea2dcac233c6321a5ba242a183f6033a 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI information"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr ""
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -202,12 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
-msgstr ""
-
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -220,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be "
diff --git a/opsi/locale/es/fusiondirectory.po b/opsi/locale/es/fusiondirectory.po
index 1e49c93ff9d8004a8498bbd8e7ba9c56edf992fd..ed781550761c657525136e0fc8a5fa6c74dbee55 100644
--- a/opsi/locale/es/fusiondirectory.po
+++ b/opsi/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 17:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "Servicios"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/es_CO/fusiondirectory.po b/opsi/locale/es_CO/fusiondirectory.po
index 22e4f4d6e29bb30fd724741236d937438048afd7..7b39b23c686fe9e20f0e48723b98491e0b7abba1 100644
--- a/opsi/locale/es_CO/fusiondirectory.po
+++ b/opsi/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/es_VE/fusiondirectory.po b/opsi/locale/es_VE/fusiondirectory.po
index ca2ba3359b3d75489218e65317b23cc2edad5934..6ef73772f7adcf601edc764278c224c5792fc92b 100644
--- a/opsi/locale/es_VE/fusiondirectory.po
+++ b/opsi/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "Servicios"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/fa_IR/fusiondirectory.po b/opsi/locale/fa_IR/fusiondirectory.po
index 88ae699a5607d49c9b516afb2ef4a6c8e8ed8dbd..35fd73b9cc5079d4d46db3200d77a30bc3eff6c8 100644
--- a/opsi/locale/fa_IR/fusiondirectory.po
+++ b/opsi/locale/fa_IR/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:53+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/fi_FI/fusiondirectory.po b/opsi/locale/fi_FI/fusiondirectory.po
index f6eea45614a73cca36079fb8bc1308e81d209b68..09466d3873f92d30ab8c48a495d985adb02af0d3 100644
--- a/opsi/locale/fi_FI/fusiondirectory.po
+++ b/opsi/locale/fi_FI/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:53+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "Palvelut"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/fr/fusiondirectory.po b/opsi/locale/fr/fusiondirectory.po
index 45af98923c0fd21f9a13a0cb09395e043a1d352c..aa617065fa430a305b1b6e4de113f94c01196a8c 100644
--- a/opsi/locale/fr/fusiondirectory.po
+++ b/opsi/locale/fr/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Benoit Mortier <benoit.mortier@opensides.be>, 2016
 # MCMic, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:09+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +39,7 @@ msgstr "Pas d'adresse mac"
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr "Mise à jour des informations OPSI impossible"
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -237,7 +238,7 @@ msgstr "Impossible d'obtenir l'adresse mac pour le serveur OPSI !"
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr "Effacement des informations OPSI impossible"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -250,7 +251,7 @@ msgid "Services"
 msgstr "Services"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr "Informations sur le serveur OPSI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/hu_HU/fusiondirectory.po b/opsi/locale/hu_HU/fusiondirectory.po
index 7faaa32ee0e62fd5dde2d7d2fa2d1ab42feadb36..94566a6f066f2d01a6f95b44b3eb8d35d3da150b 100644
--- a/opsi/locale/hu_HU/fusiondirectory.po
+++ b/opsi/locale/hu_HU/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:53+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/id/fusiondirectory.po b/opsi/locale/id/fusiondirectory.po
index 975ebf8d592f08708866b1942f58e6b777c0bd7f..978af1224d8f14d86957b24a1680ae4dae9a3bbd 100644
--- a/opsi/locale/id/fusiondirectory.po
+++ b/opsi/locale/id/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:53+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/it_IT/fusiondirectory.po b/opsi/locale/it_IT/fusiondirectory.po
index 1b9421356dc135c64e2b5755f15adb222ec1fbe1..9ff3f867a2958d1ea476bdf077770cc2a0659825 100644
--- a/opsi/locale/it_IT/fusiondirectory.po
+++ b/opsi/locale/it_IT/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Paola Penati <penati@avaya.com>, 2015
+# Paola Penati <penati@avaya.com>, 2015-2016
 # Paola Penati <penati@avaya.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:26+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:21+0000\n"
+"Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "Alcun indirizzo MAC"
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr "Impossibile aggiornare le informazioni di OPSI"
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -238,7 +238,7 @@ msgstr "Impossibile ottenere indirizzo MAC per il server OPSI"
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr "Impossibile rimuovere informazioni su OPSI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -251,7 +251,7 @@ msgid "Services"
 msgstr "Servizi"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr "Informazioni sul server OPSI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/lv/fusiondirectory.po b/opsi/locale/lv/fusiondirectory.po
index bca8e2ddfa34a31a618554077fed547bffbf2e24..b73f2aff76fa2d9b0f95280ed1d8acabf8ca477d 100644
--- a/opsi/locale/lv/fusiondirectory.po
+++ b/opsi/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/nb/fusiondirectory.po b/opsi/locale/nb/fusiondirectory.po
index 391d3b44bd9405065c32d078e063c479c465b362..7e517d0ee6769990ebd760d8e9e84c3e4fa9a4a6 100644
--- a/opsi/locale/nb/fusiondirectory.po
+++ b/opsi/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/nl/fusiondirectory.po b/opsi/locale/nl/fusiondirectory.po
index f0ddbe51e366a45be1733fea37881fe80b0157f8..f4f05a97371cb975ef04bae3a4486ee47e6782e4 100644
--- a/opsi/locale/nl/fusiondirectory.po
+++ b/opsi/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "Services"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/pl/fusiondirectory.po b/opsi/locale/pl/fusiondirectory.po
index 1e4aaca3079b5720dd0dd96b3e43831c39f3ed24..950b83e30c018ed22d5689fa3c5a748055fd120c 100644
--- a/opsi/locale/pl/fusiondirectory.po
+++ b/opsi/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "Usługi"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/pt/fusiondirectory.po b/opsi/locale/pt/fusiondirectory.po
index d8adb15e82506aa9b9d5276d42f6bf02134323fe..3196aeac0e636e2916b9ea98921d26bf009b04fa 100644
--- a/opsi/locale/pt/fusiondirectory.po
+++ b/opsi/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/pt_BR/fusiondirectory.po b/opsi/locale/pt_BR/fusiondirectory.po
index 7419a6fa5bd5be1b15cfb2db5db45864269f6153..2e661fa13c33ae97f0df63fbb57885a42f473207 100644
--- a/opsi/locale/pt_BR/fusiondirectory.po
+++ b/opsi/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
-msgstr "Não foi possível atualizar informações OPSI"
+msgid "Could not update OPSI information"
+msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,8 +249,8 @@ msgid "Services"
 msgstr "Serviços"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
-msgstr "Informações do Servidor OPSI"
+msgid "OPSI Server information"
+msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "Server URI"
diff --git a/opsi/locale/ru/fusiondirectory.po b/opsi/locale/ru/fusiondirectory.po
index 40d2a128479625b4c9d3584388bd6cf1bce1ddbc..8986dc2ccae1124eb5351888a6f27b1fb593fc24 100644
--- a/opsi/locale/ru/fusiondirectory.po
+++ b/opsi/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-08 09:58+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "Сервисы"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/ru@petr1708/fusiondirectory.po b/opsi/locale/ru@petr1708/fusiondirectory.po
index 1210e5d20a4b1676253fc55ac4f48070659255c0..82119908b4a06d690673c92511e141525139b0a8 100644
--- a/opsi/locale/ru@petr1708/fusiondirectory.po
+++ b/opsi/locale/ru@petr1708/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:53+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/sv/fusiondirectory.po b/opsi/locale/sv/fusiondirectory.po
index 68ab509b2ac84e671e3beb13aab614866d0425a5..d7c2f6825d70e290d1a5a0bcef2208fc17c3d7eb 100644
--- a/opsi/locale/sv/fusiondirectory.po
+++ b/opsi/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "Tjänster"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/ug/fusiondirectory.po b/opsi/locale/ug/fusiondirectory.po
index 0e309e3efb96973b6b495b85037bb5abd904a08b..22c37417b09b983915840558f39aa5bfe447c4ab 100644
--- a/opsi/locale/ug/fusiondirectory.po
+++ b/opsi/locale/ug/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:53+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/vi_VN/fusiondirectory.po b/opsi/locale/vi_VN/fusiondirectory.po
index 268f7b7b74e5babc9abc7c8de5ff88ea509bbd39..5431a1ff8f1701c4d615fd45d77c0190c02d2f0b 100644
--- a/opsi/locale/vi_VN/fusiondirectory.po
+++ b/opsi/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/opsi/locale/zh/fusiondirectory.po b/opsi/locale/zh/fusiondirectory.po
index 9c3e69413f6ec4d439f7f29cb0f83f3a3485b63b..fc995748d42fdea7abe84cfa2a7111b778474af0 100644
--- a/opsi/locale/zh/fusiondirectory.po
+++ b/opsi/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
 #: admin/systems/opsi/class_opsiClient.inc:150
-msgid "Could not update OPSI informations"
+msgid "Could not update OPSI information"
 msgstr ""
 
 #: config/opsi/class_opsiConfig.inc:28
@@ -236,7 +236,7 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:105
 #: admin/systems/opsi/class_opsiClient.inc:193
-msgid "Could not remove OPSI informations"
+msgid "Could not remove OPSI information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
@@ -249,7 +249,7 @@ msgid "Services"
 msgstr "服务"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
-msgid "OPSI Server informations"
+msgid "OPSI Server information"
 msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
diff --git a/personal/config/personal/class_personalConfig.inc b/personal/config/personal/class_personalConfig.inc
index 85d7c346d40f9e160227924914ac89f14971d644..f178636e4aacf852763090f22c8ec51c4969b7dd 100644
--- a/personal/config/personal/class_personalConfig.inc
+++ b/personal/config/personal/class_personalConfig.inc
@@ -31,7 +31,7 @@ class personalConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/personal/locale/ar/fusiondirectory.po b/personal/locale/ar/fusiondirectory.po
index 9161bd78db114530df8006adf5ddbc0db84ccead..2ecdcbec313187094b8d89fdceecd5409fdcdb28 100644
--- a/personal/locale/ar/fusiondirectory.po
+++ b/personal/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/ca/fusiondirectory.po b/personal/locale/ca/fusiondirectory.po
index b70eb8bc6bb63606e48536d7ac708dff824a8401..b8343c7c244ff0584ed14fec86950e93bbe1657d 100644
--- a/personal/locale/ca/fusiondirectory.po
+++ b/personal/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Informació personal"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/cs_CZ/fusiondirectory.po b/personal/locale/cs_CZ/fusiondirectory.po
index 251055f44ef7b6763b4f0c2471bcf787b20b8d69..f7c66f22027ff7c47dc651470d9748e482ca2c84 100644
--- a/personal/locale/cs_CZ/fusiondirectory.po
+++ b/personal/locale/cs_CZ/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -40,8 +40,8 @@ msgid "Personal"
 msgstr "Osobní"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr "Osobní údaje"
+msgid "Personal information"
+msgstr "osobní informace"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -103,23 +103,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Kontakt"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr "Účet na společenských sítích"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr "Účty tohoto uživatele na společenských sítích"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr "Soukromý e-mail"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr "Soukromá e-mailová adresa tohoto uživatele"
 
diff --git a/personal/locale/de/fusiondirectory.po b/personal/locale/de/fusiondirectory.po
index 61c2889a0a6242ff87ae2d621d5e7d0d30712738..163eb0dc24bcdddc95e9740fee2cdedeada1f702 100644
--- a/personal/locale/de/fusiondirectory.po
+++ b/personal/locale/de/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgid "Personal"
 msgstr "Persönlich"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr "Persönliche Informationen"
 
 #: personal/personal/class_personalInfo.inc:101
@@ -103,23 +103,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Kontakt"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr "Private E-Mail"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr "Private E-Mail-Adresse dieses Benutzers"
 
diff --git a/personal/locale/el_GR/fusiondirectory.po b/personal/locale/el_GR/fusiondirectory.po
index 9406398101b2edd3fff7bd5cae959eedd6b19336..4b40448b09d2cbda585100c9c7985c9cb913ffe6 100644
--- a/personal/locale/el_GR/fusiondirectory.po
+++ b/personal/locale/el_GR/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgid "Personal"
 msgstr "Προσωπικό"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr "Προσωπικές πληροφορίες"
 
 #: personal/personal/class_personalInfo.inc:101
@@ -104,23 +104,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Επαφή"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr "Λογαριασμός κοινωνικής δικτύωσης"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr "Οι λογαριασμοί κοινωνικής δικτύωσης αυτού του χρήστη"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr "Προσωπικό email"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr "Οι προσωπικές διευθύνσεις email αυτού του χρήστη"
 
diff --git a/personal/locale/en/fusiondirectory.po b/personal/locale/en/fusiondirectory.po
index d36273d20c65ef91bb0a952e460cf2e72bc53f48..7087412793e962a339e94f51b3ac302d25f9f634 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -104,23 +104,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/es/fusiondirectory.po b/personal/locale/es/fusiondirectory.po
index 950a4f9e25e6f0ec3c146363b6c198530f83542f..03d49399a834f672a780ad3a9709e82a6702418a 100644
--- a/personal/locale/es/fusiondirectory.po
+++ b/personal/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr "Personal"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Información personal"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Contacto"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/es_CO/fusiondirectory.po b/personal/locale/es_CO/fusiondirectory.po
index 3f680459ba3c79e32f0270c66760c06ff80d4a61..3c0411ad9ab80ef851c4837d23f7f2da26dcea87 100644
--- a/personal/locale/es_CO/fusiondirectory.po
+++ b/personal/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Información personal"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/es_VE/fusiondirectory.po b/personal/locale/es_VE/fusiondirectory.po
index e04ccdc674714b6c9e190faed34261ccb31b524b..804739b0908e32c5f3356e5dba93f23393b40db4 100644
--- a/personal/locale/es_VE/fusiondirectory.po
+++ b/personal/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr "Personal"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Información personal"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Contacto"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/fa_IR/fusiondirectory.po b/personal/locale/fa_IR/fusiondirectory.po
index a2b9115f69e5e59bea9c1ed14601a0aadb4dc1dd..a00588dfcceb3916d9a8b1b772ed3957849c50dd 100644
--- a/personal/locale/fa_IR/fusiondirectory.po
+++ b/personal/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr "شخصی"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "اطلاعات شخصی"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/fi_FI/fusiondirectory.po b/personal/locale/fi_FI/fusiondirectory.po
index 35ba3692e83ef173454080576c7bd217da15315e..0509a58e1c94f94c417832a0656f1a5eba7001e2 100644
--- a/personal/locale/fi_FI/fusiondirectory.po
+++ b/personal/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-01 11:58+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr "Loppupäivämäärä"
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Yhteystiedot"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/fr/fusiondirectory.po b/personal/locale/fr/fusiondirectory.po
index 71fe5b5e14db1a3a2c658e8d14d62578d30b700e..235bf75e9f6f2cd8b5ba79d4ed5b7551f4e691bc 100644
--- a/personal/locale/fr/fusiondirectory.po
+++ b/personal/locale/fr/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:21+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:08+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgid "Personal"
 msgstr "Personnel"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr "Informations personnelles"
 
 #: personal/personal/class_personalInfo.inc:101
@@ -104,23 +104,31 @@ msgstr "Date de fin"
 msgid "Date this user is supposed to leave the company"
 msgstr "Date ou cet utilisateur est censé quitter l'entreprise"
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr "Photo visible"
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr "Est ce que la photo de l'utilisateur devrait être visible par les utilisateurs externes ?"
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Contact"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr "Compte de réseau social"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr "Comptes sur les réseaux sociaux de cet utilisateur"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr "Courriel privé"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr "Adresses de courriel privées de cet utilisateur"
 
diff --git a/personal/locale/hu_HU/fusiondirectory.po b/personal/locale/hu_HU/fusiondirectory.po
index ed31a33f504675807e980b803f410f975ad190d9..17e69180f90115ce43595edd6e5b1d8e6e8b164a 100644
--- a/personal/locale/hu_HU/fusiondirectory.po
+++ b/personal/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/id/fusiondirectory.po b/personal/locale/id/fusiondirectory.po
index c082cc6a76b1d2ded6070cc861ca051f326921d0..00903fe025c611232de78f4c732f7b9f910e24e1 100644
--- a/personal/locale/id/fusiondirectory.po
+++ b/personal/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/it_IT/fusiondirectory.po b/personal/locale/it_IT/fusiondirectory.po
index fe2379b8c750bee1cd7145e18e7cdfb839113f23..a6517e36bae28932c8ccd21c2591674c027dca77 100644
--- a/personal/locale/it_IT/fusiondirectory.po
+++ b/personal/locale/it_IT/fusiondirectory.po
@@ -6,14 +6,15 @@
 # Benoit Mortier <benoit.mortier@opensides.be>, 2016
 # Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
 # Maurizio Varriale <mavarriale@gmail.com>, 2015
+# Paola Penati <penati@avaya.com>, 2016
 # Paola Penati <penati@avaya.com>, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:26+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:18+0000\n"
+"Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +44,7 @@ msgid "Personal"
 msgstr "Personale"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr "Informazioni personali"
 
 #: personal/personal/class_personalInfo.inc:101
@@ -106,23 +107,31 @@ msgstr "Data di fine"
 msgid "Date this user is supposed to leave the company"
 msgstr "Data alla quale l'utente dovrebbe lasciare la società"
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr "Foto Visibile"
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr "La foto dell'utente dovrebbe essere visibile su strumenti esterni"
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Contatto"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr "Account social"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr "Account social di questo utente"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr "Email personale"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr "Indirizzo email personale di questo utente"
 
diff --git a/personal/locale/lv/fusiondirectory.po b/personal/locale/lv/fusiondirectory.po
index cbfc261899aab768a0c0a47adc6a808649209748..3829738f232c340c78362519d024cc3ceee7e8e7 100644
--- a/personal/locale/lv/fusiondirectory.po
+++ b/personal/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Kontakts"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/nb/fusiondirectory.po b/personal/locale/nb/fusiondirectory.po
index 725da2354c46ad96bd9801dedd5f16e3aa5f03eb..465dcb235554826845bcd6f1aaf289b1b89747eb 100644
--- a/personal/locale/nb/fusiondirectory.po
+++ b/personal/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/nl/fusiondirectory.po b/personal/locale/nl/fusiondirectory.po
index 7c7555d9d00b5dfde3d0fedf3ddb42f2e1254e42..ba6363f52d5347380ccd8b28d463e7af81f145a3 100644
--- a/personal/locale/nl/fusiondirectory.po
+++ b/personal/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr "Persoonlijk"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Persoonlijke informatie"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Contact"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/pl/fusiondirectory.po b/personal/locale/pl/fusiondirectory.po
index 69d1c066fe1a3db8b67ca618348337028994abf4..75171ea7177f15f7aab479813d8ad198b121ebe1 100644
--- a/personal/locale/pl/fusiondirectory.po
+++ b/personal/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr "Osobiste"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Informacje osobiste"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Kontakt"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/pt/fusiondirectory.po b/personal/locale/pt/fusiondirectory.po
index 12b0190e8c5155ed21e6a6734c87ae9aff83a53b..badcac69bdc4faae7af655d95f31820fcf39a05c 100644
--- a/personal/locale/pt/fusiondirectory.po
+++ b/personal/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Informação pessoal"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/pt_BR/fusiondirectory.po b/personal/locale/pt_BR/fusiondirectory.po
index 2fa6296e0a1a58ab27cb9ea6515f7ee24d41c3c3..1a1ef66aba74c1dbbdebf5471a65099543fc9c20 100644
--- a/personal/locale/pt_BR/fusiondirectory.po
+++ b/personal/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr "Pessoal"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Contato"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/ru/fusiondirectory.po b/personal/locale/ru/fusiondirectory.po
index 28445a0808d736d06a14be85745081925a75bf17..6f97d64a2671a1b31d1253b0419c52745225d71d 100644
--- a/personal/locale/ru/fusiondirectory.po
+++ b/personal/locale/ru/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgid "Personal"
 msgstr "Личная"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr "Личная информация"
 
 #: personal/personal/class_personalInfo.inc:101
@@ -104,23 +104,31 @@ msgstr "Дата окончания"
 msgid "Date this user is supposed to leave the company"
 msgstr "Дата, когда пользователь должен покинуть комапанию"
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "Контакт"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr "Аккаунт в социальных сетях"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr "Под какой учетной записью пользователь зарегистрирован в социальных сетях"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr "Приватный адрес электронной почты"
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr "Приватный адрес электронной почты этого пользователя"
 
diff --git a/personal/locale/ru@petr1708/fusiondirectory.po b/personal/locale/ru@petr1708/fusiondirectory.po
index 486e518847172a2f7e61d2261f6e2b873c1af73c..62bd3f10389f5b7af5487ee4048527c0cd428f46 100644
--- a/personal/locale/ru@petr1708/fusiondirectory.po
+++ b/personal/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/sv/fusiondirectory.po b/personal/locale/sv/fusiondirectory.po
index 4c46da72775a8b931d81001a0a51a0a89b10fdd9..011847be03c88d1ba18107f14f336044b6c8ad87 100644
--- a/personal/locale/sv/fusiondirectory.po
+++ b/personal/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Personlig information"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/ug/fusiondirectory.po b/personal/locale/ug/fusiondirectory.po
index 55c4c1338c829d232c4535339bf08302fa1644da..d71b4b3f8d73a8dcaacc5ccdaafc8b71aa60969e 100644
--- a/personal/locale/ug/fusiondirectory.po
+++ b/personal/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
+msgid "Personal information"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:101
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/vi_VN/fusiondirectory.po b/personal/locale/vi_VN/fusiondirectory.po
index fb193df51af037dfb0d5c455f0317d2e9f20f0ff..67c86fe1d73f94b7a6d9c4c2f3fdaf9ee8f55ca6 100644
--- a/personal/locale/vi_VN/fusiondirectory.po
+++ b/personal/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "Thông tin cá nhân"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
-msgid "Contact"
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/locale/zh/fusiondirectory.po b/personal/locale/zh/fusiondirectory.po
index 2fcada3ec200335d50c7f008de03780ad6e915b7..33dd76d13e541644d136d8fac569738070c2ba10 100644
--- a/personal/locale/zh/fusiondirectory.po
+++ b/personal/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-11 19:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Personal"
 msgstr "个人"
 
 #: personal/personal/class_personalInfo.inc:86
-msgid "Personal informations"
-msgstr ""
+msgid "Personal information"
+msgstr "个人信息"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -102,23 +102,31 @@ msgstr ""
 msgid "Date this user is supposed to leave the company"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:144
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
 msgstr "联系"
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:148
+#: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:155
+#: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
 msgstr ""
 
diff --git a/personal/personal/personal/class_personalInfo.inc b/personal/personal/personal/class_personalInfo.inc
index 3ed3f08a21c575106e360cd7b9aa43565085a273..176daea2dea24d2cbf718d0632a1dbd0d9940ad0 100644
--- a/personal/personal/personal/class_personalInfo.inc
+++ b/personal/personal/personal/class_personalInfo.inc
@@ -83,14 +83,14 @@ class personalInfo extends simplePlugin
   {
     return array(
       'plShortName'     => _('Personal'),
-      'plDescription'   => _('Personal informations'),
+      'plDescription'   => _('Personal information'),
       'plSelfModify'    => TRUE,
       'plObjectType'    => array('user'),
       'plIcon'          => 'geticon.php?context=applications&icon=user-info&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=user-info&size=16',
       'plPriority'      => 3,
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/postfix/admin/systems/services/postfix/class_servicePostfix.inc b/postfix/admin/systems/services/postfix/class_servicePostfix.inc
index 3c21f606c113d8706048f468df318a8583e56d53..8e4fe76017d3acc1b6d9ec9458f7438534d92a48 100644
--- a/postfix/admin/systems/services/postfix/class_servicePostfix.inc
+++ b/postfix/admin/systems/services/postfix/class_servicePostfix.inc
@@ -30,7 +30,7 @@ class servicePostfix extends simpleService
       'plDescription' => _('Postfix (SMTP)').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=applications&icon=smtp&size=16',
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -41,7 +41,7 @@ class servicePostfix extends simpleService
   {
     return array (
       'section1' => array (
-        'name'  => _('Informations'),
+        'name'  => _('Information'),
         'attrs' => array (
           new StringAttribute (
             _('Hostname'), _('The host name.'),
diff --git a/postfix/locale/ar/fusiondirectory.po b/postfix/locale/ar/fusiondirectory.po
index dfca853517ffced4954a7d5019326927a665cc62..a4babd867a301b7a42e94a473e457172cf9114e7 100644
--- a/postfix/locale/ar/fusiondirectory.po
+++ b/postfix/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "خدمات"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "معلومات"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/ca/fusiondirectory.po b/postfix/locale/ca/fusiondirectory.po
index 847159d308d2b0f255ed51824a3fd68e7606d818..2cf9d479eff58ee76e765c61c4aa31bdad67a0a7 100644
--- a/postfix/locale/ca/fusiondirectory.po
+++ b/postfix/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informació"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/cs_CZ/fusiondirectory.po b/postfix/locale/cs_CZ/fusiondirectory.po
index 5c2b449a4ac72f5ca440e7c2f895333a6bdf87a7..5a3ae3db60bd76a6a926ab2cf988b16a79fb53fa 100644
--- a/postfix/locale/cs_CZ/fusiondirectory.po
+++ b/postfix/locale/cs_CZ/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Služby"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr "Informace"
+msgid "Information"
+msgstr "informace"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/de/fusiondirectory.po b/postfix/locale/de/fusiondirectory.po
index 282ec5921ec2ead74d62052d5cc6cc2cb0ebd4f0..c3284958edf69e715fd527370c36a68b573768da 100644
--- a/postfix/locale/de/fusiondirectory.po
+++ b/postfix/locale/de/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Dienste"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr "Informationen"
+msgid "Information"
+msgstr "Information"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/el_GR/fusiondirectory.po b/postfix/locale/el_GR/fusiondirectory.po
index 033bc66ea0f23960b9f71f97a13074094fa25627..5c93217e8ece1fe3d5f79866f843725158408cec 100644
--- a/postfix/locale/el_GR/fusiondirectory.po
+++ b/postfix/locale/el_GR/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr "Υπηρεσίες"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr "Πληροφορίες"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/en/fusiondirectory.po b/postfix/locale/en/fusiondirectory.po
index 3955166233665b64860d18cb0100b9fa366e3c9f..3b9d45076c120635aa27ac6a84d902af0178eeb9 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/es/fusiondirectory.po b/postfix/locale/es/fusiondirectory.po
index 2b9e71ad1239a1113a8f064c564aafed79ce1802..2103b8a827f5447b26d2d177133a8d9db7e701aa 100644
--- a/postfix/locale/es/fusiondirectory.po
+++ b/postfix/locale/es/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Servicios"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Información"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/es_CO/fusiondirectory.po b/postfix/locale/es_CO/fusiondirectory.po
index 18317405a7ce7beb50de51605db5cc39d02d6bca..044101e78db33ed00e34ca8c7206aef831d2e5cd 100644
--- a/postfix/locale/es_CO/fusiondirectory.po
+++ b/postfix/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr "Datos"
+msgid "Information"
+msgstr "Información"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/es_VE/fusiondirectory.po b/postfix/locale/es_VE/fusiondirectory.po
index 94bafbcdecfe5934d7a2490c5ab675e7d666e69b..05c16159aa5890c96f2ac709786eb2c9f0226f43 100644
--- a/postfix/locale/es_VE/fusiondirectory.po
+++ b/postfix/locale/es_VE/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Servicios"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Información"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/fa_IR/fusiondirectory.po b/postfix/locale/fa_IR/fusiondirectory.po
index a362f9ca98d43a36a681920334e69adf7c7d87d5..66f49fc0db9ea7674c5bb59b2e70379c73edc67f 100644
--- a/postfix/locale/fa_IR/fusiondirectory.po
+++ b/postfix/locale/fa_IR/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/fi_FI/fusiondirectory.po b/postfix/locale/fi_FI/fusiondirectory.po
index a7598ce6cb3a0661f4a73349e805c3c3d95ad6c2..9776562be799acf1879d871d48381f237197c3ff 100644
--- a/postfix/locale/fi_FI/fusiondirectory.po
+++ b/postfix/locale/fi_FI/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr "Palvelut"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/fr/fusiondirectory.po b/postfix/locale/fr/fusiondirectory.po
index 60951198d3b5e58dfbf5c5b9a73803f6f2e32272..8b097af30381258867311255d25413b7a9e4d927 100644
--- a/postfix/locale/fr/fusiondirectory.po
+++ b/postfix/locale/fr/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Services"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr "Informations"
+msgid "Information"
+msgstr "Information"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/hu_HU/fusiondirectory.po b/postfix/locale/hu_HU/fusiondirectory.po
index f0a6ed791f352076e749f0dd2e285659901778ca..29589bd365f197cbea72f70c3ab698901d60fbbe 100644
--- a/postfix/locale/hu_HU/fusiondirectory.po
+++ b/postfix/locale/hu_HU/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/id/fusiondirectory.po b/postfix/locale/id/fusiondirectory.po
index 74e2c3cded06fab26c37de071f8f67b314b1989d..fdff6930a33c0c51df58a89e1cdf98b8161b1c61 100644
--- a/postfix/locale/id/fusiondirectory.po
+++ b/postfix/locale/id/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/it_IT/fusiondirectory.po b/postfix/locale/it_IT/fusiondirectory.po
index 4b2f6c98e9cc2db283b9d6486a2c27f9471447f4..3729589b51419523e5495ca669b94344ec89f372 100644
--- a/postfix/locale/it_IT/fusiondirectory.po
+++ b/postfix/locale/it_IT/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Servizi"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr "Informazioni"
+msgid "Information"
+msgstr "Informazione"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/lv/fusiondirectory.po b/postfix/locale/lv/fusiondirectory.po
index 95ea10ec75a88bd956860aef44a9ce8a3806fc1d..dec42e973b68f74d4409fe4d097e6b46712e3825 100644
--- a/postfix/locale/lv/fusiondirectory.po
+++ b/postfix/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informācija"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/nb/fusiondirectory.po b/postfix/locale/nb/fusiondirectory.po
index 052768f62424351a09bb02a1a428bcd66e1d4bbb..a709be923be4f7ce150a0ae7aa7d21ee6b3839e0 100644
--- a/postfix/locale/nb/fusiondirectory.po
+++ b/postfix/locale/nb/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/nl/fusiondirectory.po b/postfix/locale/nl/fusiondirectory.po
index d392c5240aed6258bd1ab68a390d19118d16f8df..f275eb95f672ead35b8ed78c12910c986633002e 100644
--- a/postfix/locale/nl/fusiondirectory.po
+++ b/postfix/locale/nl/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr "Services"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr "Informatie"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/pl/fusiondirectory.po b/postfix/locale/pl/fusiondirectory.po
index 6ada1ae94979dc382141854345165c7b59e38e0e..0f25f62031a66f78d3e74e9874f3c463a7737bd9 100644
--- a/postfix/locale/pl/fusiondirectory.po
+++ b/postfix/locale/pl/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Usługi"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informacja"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/pt/fusiondirectory.po b/postfix/locale/pt/fusiondirectory.po
index f524b1f2b04bb73c5b19833ffaa8c8a7024c7f4d..9613f468013a750338e5e3d006039bac13d234e1 100644
--- a/postfix/locale/pt/fusiondirectory.po
+++ b/postfix/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Informação"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/pt_BR/fusiondirectory.po b/postfix/locale/pt_BR/fusiondirectory.po
index 4016d26ceecf11a24db2f4007b5c7e8b6d74d67c..97a0b30860137f661ebe5cd5a7ace9734e8081d5 100644
--- a/postfix/locale/pt_BR/fusiondirectory.po
+++ b/postfix/locale/pt_BR/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Serviços"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr "Informações"
+msgid "Information"
+msgstr "Informação"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/ru/fusiondirectory.po b/postfix/locale/ru/fusiondirectory.po
index 1b23dcc3b43301c4a08e23942645c5ac602c7541..eb9b1ef7be65862026a45a19b09bf0dc67722b8c 100644
--- a/postfix/locale/ru/fusiondirectory.po
+++ b/postfix/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr "Сервисы"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr "Информация"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/ru@petr1708/fusiondirectory.po b/postfix/locale/ru@petr1708/fusiondirectory.po
index 6f9f3ff7b1e05010ebf51df1a2a25a8156771555..dc11f169e2ec5bc9fa1c294d094c06a01548fdb1 100644
--- a/postfix/locale/ru@petr1708/fusiondirectory.po
+++ b/postfix/locale/ru@petr1708/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/sv/fusiondirectory.po b/postfix/locale/sv/fusiondirectory.po
index 09182630047d1fd515ad6ffe9fab63c1e633d59b..fbe3186b257d833117937b82441bc924446b4eb4 100644
--- a/postfix/locale/sv/fusiondirectory.po
+++ b/postfix/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "Tjänster"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Information"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/ug/fusiondirectory.po b/postfix/locale/ug/fusiondirectory.po
index d0657c137327600af9afa97fcaaec59a70c62d3f..bef628e6dfc3053465d905d8f3656c37075005e1 100644
--- a/postfix/locale/ug/fusiondirectory.po
+++ b/postfix/locale/ug/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-04-13 13:07+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
diff --git a/postfix/locale/vi_VN/fusiondirectory.po b/postfix/locale/vi_VN/fusiondirectory.po
index 023e9c18dfee9b82635e7a751202f47a918a8f31..d94e903cb5c442cd3b374d2657469a422b0ebcbb 100644
--- a/postfix/locale/vi_VN/fusiondirectory.po
+++ b/postfix/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "Thông tin"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/postfix/locale/zh/fusiondirectory.po b/postfix/locale/zh/fusiondirectory.po
index e1c1bff27cb142c6de816550f0eaee5bfad7378e..c4c22bf3523ab8e30e90aae7e7ec6ffd8c0f66fe 100644
--- a/postfix/locale/zh/fusiondirectory.po
+++ b/postfix/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -27,8 +27,8 @@ msgid "Services"
 msgstr "服务"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
-msgid "Informations"
-msgstr ""
+msgid "Information"
+msgstr "提示信息"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
diff --git a/ppolicy/admin/ppolicy/class_ppolicy.inc b/ppolicy/admin/ppolicy/class_ppolicy.inc
index b92cdafaaba178103f4a1c975ce1d3b1aa8740fa..bf42464de7553361ba1cd53f3df097073b1c6df2 100644
--- a/ppolicy/admin/ppolicy/class_ppolicy.inc
+++ b/ppolicy/admin/ppolicy/class_ppolicy.inc
@@ -25,7 +25,7 @@ class ppolicy extends simplePlugin
 
   var $objectclasses = array('device', 'pwdPolicy', 'pwdPolicyChecker');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling  */
   public static function plInfo()
   {
     return array(
@@ -38,7 +38,7 @@ class ppolicy extends simplePlugin
         'icon'        => 'geticon.php?context=applications&icon=ppolicy&size=16'
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ppolicy/config/ppolicy/class_ppolicyConfig.inc b/ppolicy/config/ppolicy/class_ppolicyConfig.inc
index cf71e29d7905940c7d9dab2162f5a02050589524..e73e0d4925c60bd76d79d4720aa0b9a709c24e7f 100644
--- a/ppolicy/config/ppolicy/class_ppolicyConfig.inc
+++ b/ppolicy/config/ppolicy/class_ppolicyConfig.inc
@@ -32,7 +32,7 @@ class ppolicyConfig extends simplePlugin
       "plCategory"      => array("configuration"),
       "plObjectType"    => array("smallConfig"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ppolicy/locale/ar/fusiondirectory.po b/ppolicy/locale/ar/fusiondirectory.po
index 6086d0a902922bc7a4b93eddac184760b166155c..75efcb65c431d70dddc96001314e91f178cf6273 100644
--- a/ppolicy/locale/ar/fusiondirectory.po
+++ b/ppolicy/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 9b6c0d651525ba08227945a010669e48fe5f3612..384421f6583383b723aac16e4a04c416cedae301 100644
--- a/ppolicy/locale/ca/fusiondirectory.po
+++ b/ppolicy/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Error de la configuració"
 
@@ -111,7 +111,7 @@ msgstr "Error de la configuració"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 f6fadb66aed4ecd40635b89a4c0ad9c7310659ae..09ee141eb9b230d54a04f29a0dda87958331dd4b 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -103,7 +103,7 @@ msgid "Locked accounts"
 msgstr "Uzamčené účty"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Chyba v nastavení"
 
@@ -112,7 +112,7 @@ msgstr "Chyba v nastavení"
 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:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 4ccfd7960bb17aec6c53bac94311820010ce8a8b..7e22291777e2769bea3bcd436d8f822644c0f683 100644
--- a/ppolicy/locale/de/fusiondirectory.po
+++ b/ppolicy/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -103,7 +103,7 @@ msgid "Locked accounts"
 msgstr "Gesperrte Konten"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -112,7 +112,7 @@ msgstr "Konfigurationsfehler"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 54df84a754b9016966fbe19f022b4d181f64a0af..df1c0947ed5f4146147792ca90bada8d7ad809d0 100644
--- a/ppolicy/locale/el_GR/fusiondirectory.po
+++ b/ppolicy/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -104,7 +104,7 @@ msgid "Locked accounts"
 msgstr "Κλειδωμένοι λογαριασμοί"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Σφάλμα ρύθμισης"
 
@@ -113,7 +113,7 @@ msgstr "Σφάλμα ρύθμισης"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Δεν ήταν δυνατή η εύρεση του Ppolicy \"%s\" στο LDAP!"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr "Η Ppolicy \"%s\" που έχει οριστεί για χρήστη \"%s\" δεν μπορεί να βρεθεί στο LDAP!"
diff --git a/ppolicy/locale/en/fusiondirectory.po b/ppolicy/locale/en/fusiondirectory.po
index dfb1be21110ffdc098adc337474c7c944830caa7..089ca3e6a6b43352e001cd42753705783468ab6b 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -18,6 +18,133 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -26,21 +153,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/es/fusiondirectory.po b/ppolicy/locale/es/fusiondirectory.po
index e8bbc0a4d6610d50d29b0b9de23efe36ff912b10..24a7be69d744b1310d63a970c21c0e3b72945f7a 100644
--- a/ppolicy/locale/es/fusiondirectory.po
+++ b/ppolicy/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
@@ -111,7 +111,7 @@ msgstr "Error en la configuración"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 83d85dc63f73c93e9878bb9b493a3597a9832716..674d5f9ce387c6ab0f0694c3816ebc84a144e457 100644
--- a/ppolicy/locale/es_CO/fusiondirectory.po
+++ b/ppolicy/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Error de configuración"
 
@@ -111,7 +111,7 @@ msgstr "Error de configuración"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 1164d4f3152fd2d03730a6ece57f59e549719c3b..11a821dbb1f69f1fd5ebaf9fef81e0bd981b0965 100644
--- a/ppolicy/locale/es_VE/fusiondirectory.po
+++ b/ppolicy/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
@@ -111,7 +111,7 @@ msgstr "Error en la configuración"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 4c3f528e0eacf10fe6d2ecfc8f6e64ad2779ab1b..39159e6003b6bda089d54e41a48b238a3e29e9a4 100644
--- a/ppolicy/locale/fa_IR/fusiondirectory.po
+++ b/ppolicy/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 d5094ba55f1b2fd65b0982a56cd46f1480c5d809..30411e716f3bbd9b95d3f883abb9f5810d961f64 100644
--- a/ppolicy/locale/fi_FI/fusiondirectory.po
+++ b/ppolicy/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 4fee99f63d9e0cb8f0919f45508ae1f4c59d235c..13199d709651336495bf9ce7af8ac3c1b5599055 100644
--- a/ppolicy/locale/fr/fusiondirectory.po
+++ b/ppolicy/locale/fr/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 07:07+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -105,7 +105,7 @@ msgid "Locked accounts"
 msgstr "Comptes verrouillés "
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -114,7 +114,7 @@ msgstr "Erreur de configuration"
 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:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr "La ppolicy \"%s\" pour l'utilisateur \"%s\" n’a pas été trouvée dans le LDAP !"
diff --git a/ppolicy/locale/hu_HU/fusiondirectory.po b/ppolicy/locale/hu_HU/fusiondirectory.po
index cade33476831f1ce6b119f6009f22537f1a95fa9..4e391df5e55b6d77697abddac8a950bfbc4879cc 100644
--- a/ppolicy/locale/hu_HU/fusiondirectory.po
+++ b/ppolicy/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 fe8b61e6a51d5db94bcfafec6714c62eb9243c21..9ce99b2a33197a949e8c7f9b776e8e1af70b2add 100644
--- a/ppolicy/locale/id/fusiondirectory.po
+++ b/ppolicy/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 6705d7e34d6d8a7b1645c71217d68901604a6c53..b1de44f75ba9c7953639a59d98bcadf925483412 100644
--- a/ppolicy/locale/it_IT/fusiondirectory.po
+++ b/ppolicy/locale/it_IT/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:26+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -105,7 +105,7 @@ msgid "Locked accounts"
 msgstr "Account bloccati"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
@@ -114,7 +114,7 @@ msgstr "Errore di configurazione"
 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:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr "La ppolicy  \"%s\" impostata per l'utente  \"%s\"  non é stata trovata nell'LDAP!"
diff --git a/ppolicy/locale/lv/fusiondirectory.po b/ppolicy/locale/lv/fusiondirectory.po
index ede6e298ce109a38921a08fe66bbd22c74d83d4d..e717154a3bd3fd4a58e69be5f96f69594d19dabf 100644
--- a/ppolicy/locale/lv/fusiondirectory.po
+++ b/ppolicy/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 ff4cefa3cb21673f64f6d65b4b7a46cc1a3ff92f..ea2a2ccc795284148c4750cb8e4f89369b604e19 100644
--- a/ppolicy/locale/nb/fusiondirectory.po
+++ b/ppolicy/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 5ba113f66482447210f0c45eb6d2401e7f27240b..465e24266812d9d8d205d6257525316aaba8dd4a 100644
--- a/ppolicy/locale/nl/fusiondirectory.po
+++ b/ppolicy/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Configuratie fout"
 
@@ -111,7 +111,7 @@ msgstr "Configuratie fout"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 1f648aa680daca2c8b6363f41a7e5727e8da1b9e..844dbed9b9997dd527d83d35fe83d40910c1ae5a 100644
--- a/ppolicy/locale/pl/fusiondirectory.po
+++ b/ppolicy/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "BÅ‚Ä…d konfiguracji"
 
@@ -111,7 +111,7 @@ msgstr "BÅ‚Ä…d konfiguracji"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 01bc5dd46b3ad5e45845e3f732effee675172556..a01d443fb2603bc1ab405484d4d7646536a0ce1a 100644
--- a/ppolicy/locale/pt/fusiondirectory.po
+++ b/ppolicy/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
@@ -111,7 +111,7 @@ msgstr "Erro de configuração"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 da1d0d6fd5d6bc9091df7bf74f1f28871e99f649..ddfccc1c098c7d0e7dfd669c5ec69247d9757c84 100644
--- a/ppolicy/locale/pt_BR/fusiondirectory.po
+++ b/ppolicy/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
@@ -111,7 +111,7 @@ msgstr "Erro de configuração"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 83cde3ff28bdd64ab2d12efe5fd5607064289fc0..34a39a85ef1048fcd824f9a8034ab38ad06d82e6 100644
--- a/ppolicy/locale/ru/fusiondirectory.po
+++ b/ppolicy/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Ошибка конфигурации"
 
@@ -111,7 +111,7 @@ msgstr "Ошибка конфигурации"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 b15a8cb18ae9b885817b58cc9448aa6d77d1b85a..f85db31a6b4393afcb21bc1a3e118c5aa5d8befd 100644
--- a/ppolicy/locale/ru@petr1708/fusiondirectory.po
+++ b/ppolicy/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 52148dd3eec416bf257b8227c83a5c07d13a9954..adcc5a474a219b008c8b438bc94399ac30be8274 100644
--- a/ppolicy/locale/sv/fusiondirectory.po
+++ b/ppolicy/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
 
@@ -111,7 +111,7 @@ msgstr "Konfigurationsfel"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 aab3a110ae4e1426849fecc72a5aee361c10a565..1e43167f3f591bc21d6e7061d377a7aaa8c590ef 100644
--- a/ppolicy/locale/ug/fusiondirectory.po
+++ b/ppolicy/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 c10bb77b1549571dab42e9a2762a103b99d60dc9..5b558cd78aaa7a2d651bc09d9b9686c86ef12b5d 100644
--- a/ppolicy/locale/vi_VN/fusiondirectory.po
+++ b/ppolicy/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
@@ -111,7 +111,7 @@ msgstr "Lỗi cấu hình"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, 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 b818540f8cddc46966ad847ebef22c8d42ac0f19..83aebc04920bb4ad0cf0fa9e18f98a4c8b42bfd4 100644
--- a/ppolicy/locale/zh/fusiondirectory.po
+++ b/ppolicy/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:128
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/personal/ppolicy/class_ppolicyAccount.inc b/ppolicy/personal/ppolicy/class_ppolicyAccount.inc
index dd5e3fe9aec20c63c7da1050b31a39679a27d90d..2f17a1d47c37a72ebbcb06b3fb119de5743d3061 100644
--- a/ppolicy/personal/ppolicy/class_ppolicyAccount.inc
+++ b/ppolicy/personal/ppolicy/class_ppolicyAccount.inc
@@ -33,7 +33,7 @@ class ppolicyAccount extends simplePlugin
       'plIcon'          => 'geticon.php?context=applications&icon=ppolicy&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=ppolicy&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/puppet/admin/systems/puppet/class_puppetNode.inc b/puppet/admin/systems/puppet/class_puppetNode.inc
index bf8b9b98b7786700d25cb92f474793e4cdad4519..8b132f314759643730ba76835cc42f4b7df2375d 100644
--- a/puppet/admin/systems/puppet/class_puppetNode.inc
+++ b/puppet/admin/systems/puppet/class_puppetNode.inc
@@ -64,7 +64,7 @@ class puppetNode extends simplePlugin
       "plDescription"     => _("Support for puppet schema in order to edit puppet classes and puppet vars"),
       "plSelfModify"      => FALSE,
       "plObjectType"      => array("server", "workstation"),
-      "plProvidedAcls"    => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"    => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/puppet/admin/systems/services/puppet/class_servicePuppet.inc b/puppet/admin/systems/services/puppet/class_servicePuppet.inc
index 07fdba2531929027e564886e3b8ba050a4f9854c..0fd71a20f18e9f28d074cd48b441c11e4b82fbfe 100644
--- a/puppet/admin/systems/services/puppet/class_servicePuppet.inc
+++ b/puppet/admin/systems/services/puppet/class_servicePuppet.inc
@@ -29,7 +29,7 @@ class servicePuppet extends simpleService {
       'plDescription'     => _('This service allows you to use a puppet server'),
       'plIcon'            => 'geticon.php?context=applications&icon=puppet&size=16',
 
-      'plProvidedAcls'    => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'    => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/puppet/locale/ar/fusiondirectory.po b/puppet/locale/ar/fusiondirectory.po
index abb8c329e3d199a75beddc61f0eb821439572323..b2d2e55cdf7664d293b9ef3817a07a7612901dfd 100644
--- a/puppet/locale/ar/fusiondirectory.po
+++ b/puppet/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,43 +17,43 @@ 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"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/ca/fusiondirectory.po b/puppet/locale/ca/fusiondirectory.po
index 1ede05d65590e39369654ef40ccf3a601d75c03a..be00a43977ccb4a4d0eb52346b8c4bbc36e8f294 100644
--- a/puppet/locale/ca/fusiondirectory.po
+++ b/puppet/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/cs_CZ/fusiondirectory.po b/puppet/locale/cs_CZ/fusiondirectory.po
index 5925550374b4aae4dec3e3d4bef73ccf54bd6741..10156fa71b5e845706cd1bec9f6130f28671e5ad 100644
--- a/puppet/locale/cs_CZ/fusiondirectory.po
+++ b/puppet/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr "Nastavení Puppet uzlu"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr "Třída Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr "Třída Puppet uzlu"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Nadřazený uzel"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr "Nadřazený Puppet uzel"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Prostředí"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr "Prostředí Puppet uzlu"
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr "Nastavení proměnné pro puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr "Název proměnné"
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr "Hodnota proměnné"
 
diff --git a/puppet/locale/de/fusiondirectory.po b/puppet/locale/de/fusiondirectory.po
index 684b81f36512f2bec3162580a656ff13b0e9cbce..fc824c13d068d99e57fe31ae60de82bfe5aa491f 100644
--- a/puppet/locale/de/fusiondirectory.po
+++ b/puppet/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr "Puppetknoteneinstellungen"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr "Puppet Klasse"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr "Puttet Node Klasse"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Parent-Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr "Puppet Parent Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Umgebung"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr "Puppet Node Umgebung"
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr "Eine Variableneinstellung für Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr "Name der Variable"
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr "Wert der Variable"
 
diff --git a/puppet/locale/el_GR/fusiondirectory.po b/puppet/locale/el_GR/fusiondirectory.po
index 51ca8ebc96cb02d8110b76df88fdddfaee4c1fe5..2554c045551cec9d2c981b5043c7251a8d3fd02d 100644
--- a/puppet/locale/el_GR/fusiondirectory.po
+++ b/puppet/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -19,43 +19,43 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr "Ρυθμίσεις Puppet node"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr "Κλάση Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr "Κλάση Puppet Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Γονικό node"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr "Γονικό Puppet Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Περιβάλλον"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr "Περιβάλλον Puppet Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr "Μια μεταβλητή ρύθμιση για το puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr "Το όνομα της μεταβλητής"
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr "Τιμή της μεταβλητής"
 
diff --git a/puppet/locale/en/fusiondirectory.po b/puppet/locale/en/fusiondirectory.po
index d79b35c25483cb4d1b76b36fed16b78ac83bc847..729d0cdca1150ca89f5a033d714420af059569c8 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/es/fusiondirectory.po b/puppet/locale/es/fusiondirectory.po
index ab3177786066d9eb3ad5e3ae12bc99cd7c6d6445..6131423fc09e598a1558686feab56b4e13b01ac1 100644
--- a/puppet/locale/es/fusiondirectory.po
+++ b/puppet/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Servidor Origen"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Entorno"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/es_CO/fusiondirectory.po b/puppet/locale/es_CO/fusiondirectory.po
index e462d28f2946011bae9e847d6cafc24451ce2db5..b31d71c636dd3c01a37a4939d4bd2539801b68ed 100644
--- a/puppet/locale/es_CO/fusiondirectory.po
+++ b/puppet/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/es_VE/fusiondirectory.po b/puppet/locale/es_VE/fusiondirectory.po
index 291121c3df6e927ac2961350269f12eb1b6b269b..d76271b5b41a5a9df1dcc1de867e785c526b7692 100644
--- a/puppet/locale/es_VE/fusiondirectory.po
+++ b/puppet/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr "Opciones de nodo Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr "Clase de Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr "Clase del nodo Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Nodo padre"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr "Nodo Puppet padre"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Entorno"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr "Entorno de Nodo Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr "Una configuración de variable para Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/fa_IR/fusiondirectory.po b/puppet/locale/fa_IR/fusiondirectory.po
index 09f4e4db67d60c5708ebfed37951c971a950526b..918d71fc391434561993732335f52996270f4733 100644
--- a/puppet/locale/fa_IR/fusiondirectory.po
+++ b/puppet/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/fi_FI/fusiondirectory.po b/puppet/locale/fi_FI/fusiondirectory.po
index c98af8a6ad230ee74eb0178afd05878a10e354e1..a91c169cb8e50924f773e560ee8ff87a3c387c43 100644
--- a/puppet/locale/fi_FI/fusiondirectory.po
+++ b/puppet/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/fr/fusiondirectory.po b/puppet/locale/fr/fusiondirectory.po
index c4c84793ba50b58608607f1100ab28572c962fb0..89646af514c5eb15ef6d185d89227bf1f3e2cf38 100644
--- a/puppet/locale/fr/fusiondirectory.po
+++ b/puppet/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr "Paramètres de nœud Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr "Classe Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr "Classe de nœud Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "NÅ“ud parent"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr "NÅ“ud Puppet parent"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Environnement"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr "Environnement de nœud Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr "Un paramètre variable pour puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr "Nom de la variable"
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr "Valeur de la variable"
 
diff --git a/puppet/locale/hu_HU/fusiondirectory.po b/puppet/locale/hu_HU/fusiondirectory.po
index f366b91ef77a17cc9df89180606c944f31a689dd..1ecc133ded51c6a2646512014f95c9fc50fac89c 100644
--- a/puppet/locale/hu_HU/fusiondirectory.po
+++ b/puppet/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/id/fusiondirectory.po b/puppet/locale/id/fusiondirectory.po
index 550fb9a8e7e02ca1bc9d54a1036c6c9dab00c320..a291db88aecbc42c25215dfa4dd9f79a6af79028 100644
--- a/puppet/locale/id/fusiondirectory.po
+++ b/puppet/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/it_IT/fusiondirectory.po b/puppet/locale/it_IT/fusiondirectory.po
index 868bb030936e2dea9e6827a19320e8d2cc75611c..195bd20cd8b4e044a40db359a74991c498c2d62f 100644
--- a/puppet/locale/it_IT/fusiondirectory.po
+++ b/puppet/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:27+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,43 +19,43 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr "Impostazioni del nodo puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr "Classe puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr "Classe del nodo puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Nodo genitore"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr "Nodo genitore Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Ambiente"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr "Ambiente del nodo puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr "Impostazione di una variabile di Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr "Nome della variabile"
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr "Valore della variabile"
 
diff --git a/puppet/locale/lv/fusiondirectory.po b/puppet/locale/lv/fusiondirectory.po
index a5e147a4c89235250ebf68ffa2fac7123413255f..41427548f6c2d4abb7fb2bbf9454feb63f80941d 100644
--- a/puppet/locale/lv/fusiondirectory.po
+++ b/puppet/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/nb/fusiondirectory.po b/puppet/locale/nb/fusiondirectory.po
index d23e7d26a3216de45c8037b219e1737e28992dd4..46862189f40e7dc5aebd9ddf3f12a4848d4265bb 100644
--- a/puppet/locale/nb/fusiondirectory.po
+++ b/puppet/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/nl/fusiondirectory.po b/puppet/locale/nl/fusiondirectory.po
index aeeacd9b37449f3f24459012d042ee5a08c4a3ef..49ed1a2000c40b85a5236b60f70426c59518e7b8 100644
--- a/puppet/locale/nl/fusiondirectory.po
+++ b/puppet/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Parent node"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Omgeving"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/pl/fusiondirectory.po b/puppet/locale/pl/fusiondirectory.po
index 9f02c8dc52f17290f536939215d11db81181a18e..287cfdda45cfe9c6bf2ff55079c86ce7da33de5d 100644
--- a/puppet/locale/pl/fusiondirectory.po
+++ b/puppet/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Åšrodowisko"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/pt/fusiondirectory.po b/puppet/locale/pt/fusiondirectory.po
index 5e632c57aea1c61d34775a9c54ee416672bfda8d..766ce5ca12fce06add72d864dff1d6087f55d31d 100644
--- a/puppet/locale/pt/fusiondirectory.po
+++ b/puppet/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Ambiente"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/pt_BR/fusiondirectory.po b/puppet/locale/pt_BR/fusiondirectory.po
index 100be0fee9f6a84e5e9802b30f9893e96f4e22ab..f98a2a4ebedbea1d757f584d0c2a45905999425f 100644
--- a/puppet/locale/pt_BR/fusiondirectory.po
+++ b/puppet/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr "Configurações do nó do puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr "Classe do Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr "Classe do nó do puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Nó pai"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr "Nó pai do puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Ambiente"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr "Nó ambiente do puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr "Configuração da variável para o puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr "Nome da variável"
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr "Valor da variável"
 
diff --git a/puppet/locale/ru/fusiondirectory.po b/puppet/locale/ru/fusiondirectory.po
index a13d1e46026e39162b6e84225af23adbcbf5e6a6..e4d70cd947a8d762f11bb27a221f77c4e6266d7f 100644
--- a/puppet/locale/ru/fusiondirectory.po
+++ b/puppet/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,43 +17,43 @@ 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"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Окружение"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/ru@petr1708/fusiondirectory.po b/puppet/locale/ru@petr1708/fusiondirectory.po
index 08e929b57d2feb52cfbdf99f5f356832d3019d93..4f340eb4ce4b8b462f4cdb5b05defff88f072a18 100644
--- a/puppet/locale/ru@petr1708/fusiondirectory.po
+++ b/puppet/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,43 +17,43 @@ 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"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/sv/fusiondirectory.po b/puppet/locale/sv/fusiondirectory.po
index 9afcd469f7aa4d30bcbca6a87c1c2de9406b3560..36192651f69082b08e7d691d3b770d91e94fdef8 100644
--- a/puppet/locale/sv/fusiondirectory.po
+++ b/puppet/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr "Puppet nodinställningar"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr "Puppet klass"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr "Puppet Nodklass"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr "Föräldranod"
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr "Puppet föräldranod"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Miljö"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr "Puppet Nodmiljö"
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr "En variabelinställning för puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr "Namn på variabeln"
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr "Värde på variabeln"
 
diff --git a/puppet/locale/ug/fusiondirectory.po b/puppet/locale/ug/fusiondirectory.po
index f486a7c56302e1cff1b7f65c30db5f0ae2e715a9..1339a48fb24314ee6b989659223a02e7959a7fb7 100644
--- a/puppet/locale/ug/fusiondirectory.po
+++ b/puppet/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/vi_VN/fusiondirectory.po b/puppet/locale/vi_VN/fusiondirectory.po
index 2860c910ba2774661432707ca3c388e8968f88a4..cc7339db1107bf13015bdc8109987310ebebfbe3 100644
--- a/puppet/locale/vi_VN/fusiondirectory.po
+++ b/puppet/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "Môi trường"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/puppet/locale/zh/fusiondirectory.po b/puppet/locale/zh/fusiondirectory.po
index ac52746f12a35bd722f5a43fa6ffd92df593cafd..989838432f44bdea9d7fe4b4eb0bb10963e34b78 100644
--- a/puppet/locale/zh/fusiondirectory.po
+++ b/puppet/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:33
+#: admin/systems/puppet/class_puppetNode.inc:31
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:34
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:38
+#: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Environment"
 msgstr "环境设置"
 
-#: admin/systems/puppet/class_puppetNode.inc:39
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:42
+#: admin/systems/puppet/class_puppetNode.inc:40
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:45
+#: admin/systems/puppet/class_puppetNode.inc:43
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:46
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Value of the variable"
 msgstr ""
 
diff --git a/pureftpd/locale/ar/fusiondirectory.po b/pureftpd/locale/ar/fusiondirectory.po
index b7209cfd4f840a4fe08a50a91b76f5f5a36358eb..86cd71fbc88505e5c2ffced33581a58c71e414ec 100644
--- a/pureftpd/locale/ar/fusiondirectory.po
+++ b/pureftpd/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/pureftpd/locale/ca/fusiondirectory.po b/pureftpd/locale/ca/fusiondirectory.po
index 813b3e229f18c00bb4e550ce1656539d7aadc81e..c34d0678d5cb8f081736bf5bc9b4dd0ab6d06b52 100644
--- a/pureftpd/locale/ca/fusiondirectory.po
+++ b/pureftpd/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/pureftpd/locale/cs_CZ/fusiondirectory.po b/pureftpd/locale/cs_CZ/fusiondirectory.po
index 672e7a9dad25452e82592d30df7970389edc1ebc..943674edb22fbfa0bcefd112119219e7efd4d80d 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/pureftpd/locale/de/fusiondirectory.po b/pureftpd/locale/de/fusiondirectory.po
index 8b7bc710f9962f0c130cc05c8c97ec9d30cd4ffa..b2725401517e61f64cd1d0ace88bb61054d52f7a 100644
--- a/pureftpd/locale/de/fusiondirectory.po
+++ b/pureftpd/locale/de/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/pureftpd/locale/el_GR/fusiondirectory.po b/pureftpd/locale/el_GR/fusiondirectory.po
index e68da82f62a4ef4315b7d84032123c74fb59a4b7..712c340d8066b2d30c2ecaa2efc285d4a42b72a6 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/pureftpd/locale/en/fusiondirectory.po b/pureftpd/locale/en/fusiondirectory.po
index 9f8bfc28b3fbf2f850bcf054a9c6209a649ec981..6ad7bfb2868028475d811a25f272cc8c237a373d 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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 6183d841831a58893c6fc936cd600bee75db5cb5..1a25d5d5128fae9dfe8be0018947a42609b555ac 100644
--- a/pureftpd/locale/es/fusiondirectory.po
+++ b/pureftpd/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/pureftpd/locale/es_CO/fusiondirectory.po b/pureftpd/locale/es_CO/fusiondirectory.po
index 2c8999d544f4a03d369408ee4b515b159c911002..12f7bb91b2ced3ccfce7f08f235a07d998c6bc9c 100644
--- a/pureftpd/locale/es_CO/fusiondirectory.po
+++ b/pureftpd/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/pureftpd/locale/es_VE/fusiondirectory.po b/pureftpd/locale/es_VE/fusiondirectory.po
index b4501c65343acee1d2f01eb11244068ff1aaaaf7..2f18d2d70716026076476a2a09a0ffc14eff1299 100644
--- a/pureftpd/locale/es_VE/fusiondirectory.po
+++ b/pureftpd/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/pureftpd/locale/fa_IR/fusiondirectory.po b/pureftpd/locale/fa_IR/fusiondirectory.po
index c0634640e452fe0ea7fd2b15ea5770f3051aa3c6..ef25f75a8743ae7724688dfc6ece71547dda70a4 100644
--- a/pureftpd/locale/fa_IR/fusiondirectory.po
+++ b/pureftpd/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/pureftpd/locale/fi_FI/fusiondirectory.po b/pureftpd/locale/fi_FI/fusiondirectory.po
index 32fbdf75e0817caa371de10ec097f8210ac96dfa..d4dfd560de9648d90c76131465a2ab61624689b2 100644
--- a/pureftpd/locale/fi_FI/fusiondirectory.po
+++ b/pureftpd/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/pureftpd/locale/fr/fusiondirectory.po b/pureftpd/locale/fr/fusiondirectory.po
index a33cf512ebec03c1f6b5746f0d1ce165832760b3..19bdbed2176f8e45ef6da0e67dafe051a57e167c 100644
--- a/pureftpd/locale/fr/fusiondirectory.po
+++ b/pureftpd/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/pureftpd/locale/hu_HU/fusiondirectory.po b/pureftpd/locale/hu_HU/fusiondirectory.po
index c51870fad005f85579a2690119d77f9c87c55cf4..f09c10536498197468aedaa73fe3670ff599357c 100644
--- a/pureftpd/locale/hu_HU/fusiondirectory.po
+++ b/pureftpd/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/pureftpd/locale/id/fusiondirectory.po b/pureftpd/locale/id/fusiondirectory.po
index a7cb2d62f03df3918a978e4c36b5087ce9424883..04e15fbeb84689117af6f84e207483d2e449275b 100644
--- a/pureftpd/locale/id/fusiondirectory.po
+++ b/pureftpd/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/pureftpd/locale/it_IT/fusiondirectory.po b/pureftpd/locale/it_IT/fusiondirectory.po
index 9b2762d5d8a263c8b4631f74d93528de0d0930b7..b7f91da0223a89b9718d55687e24679620dbc3a8 100644
--- a/pureftpd/locale/it_IT/fusiondirectory.po
+++ b/pureftpd/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:27+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/pureftpd/locale/lv/fusiondirectory.po b/pureftpd/locale/lv/fusiondirectory.po
index 06518f741498459b938c8849c2aee6197d545195..f9243ac44fb3f6d4b962225137c8f4358cfe43cf 100644
--- a/pureftpd/locale/lv/fusiondirectory.po
+++ b/pureftpd/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/pureftpd/locale/nb/fusiondirectory.po b/pureftpd/locale/nb/fusiondirectory.po
index f067f98793680041bd917c28ce7a0b9f43a4922e..2d80f044ac67798f2a7efcc590ae5d97f2bd7855 100644
--- a/pureftpd/locale/nb/fusiondirectory.po
+++ b/pureftpd/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/pureftpd/locale/nl/fusiondirectory.po b/pureftpd/locale/nl/fusiondirectory.po
index 3c46eccdd8ddf0cffdd4f22ca1f61fc11ef929e3..c0ae2a6f17c541f3e520c87def6ab32c09693a20 100644
--- a/pureftpd/locale/nl/fusiondirectory.po
+++ b/pureftpd/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/pureftpd/locale/pl/fusiondirectory.po b/pureftpd/locale/pl/fusiondirectory.po
index 7637ee503cbd757dbcc601ae750e1c057f3bfe77..64b4cc4fd34efd6d32511e11c007100acc7d5639 100644
--- a/pureftpd/locale/pl/fusiondirectory.po
+++ b/pureftpd/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/pureftpd/locale/pt/fusiondirectory.po b/pureftpd/locale/pt/fusiondirectory.po
index 021dc36867bfc3aa5e7220d1e68251264e2fb9cc..cf6b0e7c6c7a9fcb8d46b0ea4b39f1cd7967b293 100644
--- a/pureftpd/locale/pt/fusiondirectory.po
+++ b/pureftpd/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/pureftpd/locale/pt_BR/fusiondirectory.po b/pureftpd/locale/pt_BR/fusiondirectory.po
index 98d5e804e24f6d470efb261b77d80e2f15a13ef9..0c64305d50fcc82073c60d8bf62843c4c2ed252d 100644
--- a/pureftpd/locale/pt_BR/fusiondirectory.po
+++ b/pureftpd/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/pureftpd/locale/ru/fusiondirectory.po b/pureftpd/locale/ru/fusiondirectory.po
index 84822d2fcab51c1cf86236ed3f4cf71c991ed595..3fe7204ac92af9892011048319aa3adb66b53483 100644
--- a/pureftpd/locale/ru/fusiondirectory.po
+++ b/pureftpd/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-10 07:18+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/pureftpd/locale/ru@petr1708/fusiondirectory.po b/pureftpd/locale/ru@petr1708/fusiondirectory.po
index 554afe1681e966ab4da23a2500506c26ed7ddb32..3d296b9d20c77c04d5c3a1ccf03d7cab463b9aa8 100644
--- a/pureftpd/locale/ru@petr1708/fusiondirectory.po
+++ b/pureftpd/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/pureftpd/locale/sv/fusiondirectory.po b/pureftpd/locale/sv/fusiondirectory.po
index 1ef710aa354dc3e8ae546ecabbba4c53952da30f..dc0b4f7c575b1f46cc7f2313a3b4b1059f2ad682 100644
--- a/pureftpd/locale/sv/fusiondirectory.po
+++ b/pureftpd/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/pureftpd/locale/ug/fusiondirectory.po b/pureftpd/locale/ug/fusiondirectory.po
index 51b1e65ad2a5105e988ac3f5ae0d3fde457814d0..b6b6e4cb72e05c96c08986e9dcde0bdbd86b5e83 100644
--- a/pureftpd/locale/ug/fusiondirectory.po
+++ b/pureftpd/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/pureftpd/locale/vi_VN/fusiondirectory.po b/pureftpd/locale/vi_VN/fusiondirectory.po
index b3b2d8e0d9f264f7b68517c70da3be43175a066c..57a2d79acc6dd1736459458fd0809766e9323dcb 100644
--- a/pureftpd/locale/vi_VN/fusiondirectory.po
+++ b/pureftpd/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/pureftpd/locale/zh/fusiondirectory.po b/pureftpd/locale/zh/fusiondirectory.po
index cc45bfe23c9ab50e5caeb5e024d104af09aeef92..71fc0d72b758eb0998fc7b442296f4cb60079c98 100644
--- a/pureftpd/locale/zh/fusiondirectory.po
+++ b/pureftpd/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/pureftpd/personal/pureftpd/class_pureftpdAccount.inc b/pureftpd/personal/pureftpd/class_pureftpdAccount.inc
index 44d427041aaa4822788cf87160043f6512cf1473..67b2bd0e79a884f4790af9689b32cfc6027fa4c2 100644
--- a/pureftpd/personal/pureftpd/class_pureftpdAccount.inc
+++ b/pureftpd/personal/pureftpd/class_pureftpdAccount.inc
@@ -26,7 +26,7 @@ class pureftpdAccount extends simplePlugin
   var $objectclasses  = array("PureFTPdUser");
 
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -37,7 +37,7 @@ class pureftpdAccount extends simplePlugin
       'plSelfModify'    => TRUE,
       'plPriority'      => 10,
       'plObjectType'    => array('user'),
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/quota/admin/systems/services/quota/class_serviceQuota.inc b/quota/admin/systems/services/quota/class_serviceQuota.inc
index d3c870725eaae5637734af0c2ab0e2a4735b3e51..9d16ec36e227eb14004434979ea445046644e075 100644
--- a/quota/admin/systems/services/quota/class_serviceQuota.inc
+++ b/quota/admin/systems/services/quota/class_serviceQuota.inc
@@ -30,7 +30,7 @@ class serviceQuota extends simpleService
       'plDescription' => _('Quota service').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=applications&icon=quota&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -180,13 +180,8 @@ class serviceQuota extends simpleService
 
   function getLdapServers()
   {
-    global $config;
     /* Get List of server with LDAP service */
-    $ldapServers = array();
-    foreach ($config->data['SERVERS']['LDAP'] as $dn => $attrs) {
-      $ldapServers[$dn] = $attrs['cn'][0];
-    }
-    return $ldapServers;
+    return objects::ls('server', NULL, NULL, '(objectClass=goLdapServer)');
   }
 }
 ?>
diff --git a/quota/locale/ar/fusiondirectory.po b/quota/locale/ar/fusiondirectory.po
index 848096480a286b093523e295d6021e8d940916e6..8fd0df1f7c3cc94b00e339b8aa36ca853d43dafb 100644
--- a/quota/locale/ar/fusiondirectory.po
+++ b/quota/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr "خادم"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "خدمات"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "تحذير"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/ca/fusiondirectory.po b/quota/locale/ca/fusiondirectory.po
index e46097b447525ce9a91400ebd68bc3f6a3c6fc65..18572969de368adcd256c4c42496bacaad9a1955 100644
--- a/quota/locale/ca/fusiondirectory.po
+++ b/quota/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Avís"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/cs_CZ/fusiondirectory.po b/quota/locale/cs_CZ/fusiondirectory.po
index e59c8e960659ee2a21b45e578ccd91019f88a5f2..23e893b3a3caf8da42d101b4f745d0f14b347e02 100644
--- a/quota/locale/cs_CZ/fusiondirectory.po
+++ b/quota/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr "Zásuvný modul pro kvóty"
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr "Informace o kvótách"
+msgid "Quota information"
+msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr "Informace o kvótách pro tohoto uživatele"
+msgid "Quota information for this user"
+msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Zařízení"
 
@@ -82,149 +82,149 @@ msgstr "Server"
 msgid "Server hosting the device this quota is for"
 msgstr "Server ve kterém se nachází zařízení, kterého se týká tato kvóta"
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr "Služba kvót"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Služby"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Sdílení"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr "Kvóty pro sdílení na tomto serveru"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr "Zařízení, kterého se tato kvóta týká"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr "Velikost bloku kvóty"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr "V jak velkých blocích je vyjádřena kvóta na tomto sdílení (obvykle 1024)"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Komentář"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr "Stručný komentář k této kvótě"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr "Varovná zpráva kvóty"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Znaková sada"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr "Znaková sada zprávy"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr "Příkaz pro posílání e-mailů"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr "Příkaz, umožňující serveru posílat e-maily"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr "Kontakt na podporu"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr "E-mailová adresa pro kontaktování správce"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "Od"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr "Adresa, ze které je e-mail poslán"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "v kopii poslat i (CC)"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr "Poslat kopii tohoto e-mailu na"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Předmět"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr "Předmět zaslaného varovného e-mailu"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Obsah"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr "Obsah odeslaného e-mailu"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Značka"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr "Podpis na konec e-mailové zprávy"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr "Podpora LDAP zprávy"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "LDAP server"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr "LDAP server ke kterému se připojit"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr "Rozlišené jméno uživatele, který se připojuje"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr "Rozlišené jméno uživatele, kterým se spojit"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr "Heslo uživatele, kterým se přihlašuje"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr "Heslo uživatele, použitého pro spojení"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Varování"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Neplatná hodnota v kódování znaků : %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s od %s)"
diff --git a/quota/locale/de/fusiondirectory.po b/quota/locale/de/fusiondirectory.po
index e035bb7303a8e15c2227d896101ebc992d51697c..0c132017205030d9d84a58f0a55b94e3e750ac43 100644
--- a/quota/locale/de/fusiondirectory.po
+++ b/quota/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr "Kontingentinformationen"
+msgid "Quota information"
+msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr "Kontingentinformationen für diesen Benutzer"
+msgid "Quota information for this user"
+msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Gerät"
 
@@ -82,149 +82,149 @@ msgstr "Server"
 msgid "Server hosting the device this quota is for"
 msgstr "Server, der das Gerät für dieses Kontingent bereitstellt"
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr "Kontingentdienst"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Freigaben"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr "Kontingente für die Freigaben, die dieser Server bereitstellt"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr "Gerät, die dieses Kontingent betrifft"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr "Kontingent-Blockgröße"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr "Kontingent-Blockgröße auf dieser Freigabe (normalerweise 1024)"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Kommentar"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr "Kurzer Kommentar über dieses Kontingent"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr "Kontingentwarnmeldung"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Zeichensatz"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr "Zeichensatz, der für die Nachricht verwendet werden soll"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr "E-Mail-Adresse, um den Administrator zu benachrichtigen"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "Von"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr "Eine Kopie dieser E-Mail senden an"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Betreff"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Inhalt"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr "Inhalt der gesendeten E-Mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Signatur"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr "LDAP-Nachrichtenunterstützung"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "LDAP-Server"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Warnung"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Ungültiger Wert in Kodierungen : %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s von %s)"
diff --git a/quota/locale/el_GR/fusiondirectory.po b/quota/locale/el_GR/fusiondirectory.po
index a5795861573bbff3c352f11c8b63fe5fbee47b4d..ac4bbaa7910c97819e0a72475576969b2bff8680 100644
--- a/quota/locale/el_GR/fusiondirectory.po
+++ b/quota/locale/el_GR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -27,15 +27,15 @@ msgid "Plugin for quota support"
 msgstr "Πρόσθετο για την υποστήριξη ορίων"
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr "Πληροφορίες ορίων"
+msgid "Quota information"
+msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr "Πληροφορίες ορίων αυτού του χρήστη"
+msgid "Quota information for this user"
+msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Συσκευή"
 
@@ -83,149 +83,149 @@ msgstr "Διακομιστής"
 msgid "Server hosting the device this quota is for"
 msgstr "Ο διακομιστής που έχει τη συσκευή που αφορά αυτό το όριο"
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr "Υπηρεσία ορίων"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Υπηρεσίες"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Κοινόχρηστοι πόροι"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr "Όρια κοινόχρηστων πόρων που παρέχει αυτός ο διακομιστής"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr "Συσκευή που αφορά αυτό το όριο"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr "Μέγεθος πακέτου ορίου"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr "Το μέγεθος πακέτου του ορίου αυτού του κοινόχρηστου πόρου (συνήθως 1024)"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Σχόλιο"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr "Μικρό σχόλιο σχετικά με αυτό το όριο"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr "Προειδοποιητικό μήνυμα του ορίου"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Σύνολο χαρακτήρων"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr "Το σύνολο χαρακτήρων που χρησιμοποιείται σε αυτό το μήνυμα"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr "Εντολή αποστολής mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr "Εντολή που επιτρέπει στον διακομιστή να στέλνει mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr "Επαφή υποστήριξης"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr "Ηλ. διεύθυνση γιαεπαφή με τον διαχειριστή"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "Από"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr "Ηλ. διεύθυνση αποστολέα"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "Αντίγραφο σε"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr "Αποστολή αντιγράφου αυτού του μηνύματος σε"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Θέμα"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr "Θέμα του προειδοποιητικού ηλ. μηνύματος"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Περιεχόμενο"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr "Περιεχόμενο του ηλ. μηνύματος"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Υπογραφή"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr "Υπογραφή που θα τεθεί στο τέλος του ηλ. μηνύματος"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr "LDAP για την υποστήριξη μηνυμάτων"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "Διακομιστής LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr "Ο διακομιστής LDAP που θα γίνει η σύνδεση"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr "dn αναγνωριστικό σύνδεσης"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr "Το dn αναγνωριστικό χρήστη που χρησιμοποιείται για τη σύνδεση"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr "Κωδικός σύνδεσης"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr "Ο κωδικός χρήστη που χρησιμοποιείται για τη σύνδεση"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Μη έγκυρη τιμή στις κωδικοποιήσεις: %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s by %s)"
diff --git a/quota/locale/en/fusiondirectory.po b/quota/locale/en/fusiondirectory.po
index fd2277db343a8d5717e21ad2862d5a2c4f48e4c4..5d2677d23ab4e2faac21fa7451fd98b69a7ee652 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,214 +17,214 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota information"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota information for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:50
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/es/fusiondirectory.po b/quota/locale/es/fusiondirectory.po
index a996d2b97a8aab9abdc2f8ce98d01e5d9948c0f2..9d38c9038fdd6458e92fe4e8913f09b63fa1d611 100644
--- a/quota/locale/es/fusiondirectory.po
+++ b/quota/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 17:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -82,149 +82,149 @@ msgstr "Servidor"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr "Servicio de cuotas"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Recursos compartidos"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Comentario"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Juego de caracteres"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "Desde"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "Con Copia"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Asunto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Contenido"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Firma"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "Servidor LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/es_CO/fusiondirectory.po b/quota/locale/es_CO/fusiondirectory.po
index 7388aed4893bc8532e0e871c1344e1d60eb75d31..b39353446b99d7eb5176cc690ff82d01aaa2b511 100644
--- a/quota/locale/es_CO/fusiondirectory.po
+++ b/quota/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Asunto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Precacuión"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/es_VE/fusiondirectory.po b/quota/locale/es_VE/fusiondirectory.po
index 2cf40803eb469ceba16903ddcfdfae8cf508bb44..59562e027d2f934a1e88fdd2d543172c6ad4bc46 100644
--- a/quota/locale/es_VE/fusiondirectory.po
+++ b/quota/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -82,149 +82,149 @@ msgstr "Servidor"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr "Servicio de cuotas"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Recursos compartidos"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Comentario"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Juego de caracteres"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "Desde"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "Con Copia"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Asunto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Contenido"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Firma"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "Servidor LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/fa_IR/fusiondirectory.po b/quota/locale/fa_IR/fusiondirectory.po
index fff900778bc7e04698a54b9ab6c9e50b4b27d785..ae9636cc454ac82ef3730a99b81f16122dc269b2 100644
--- a/quota/locale/fa_IR/fusiondirectory.po
+++ b/quota/locale/fa_IR/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:56+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/fi_FI/fusiondirectory.po b/quota/locale/fi_FI/fusiondirectory.po
index 047354d75725d7ea682e73a7391eee78581fa932..8582157ed52f4cb6c6f20d1277fe7a820e5fee3f 100644
--- a/quota/locale/fi_FI/fusiondirectory.po
+++ b/quota/locale/fi_FI/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:56+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Palvelut"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Varoitus"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/fr/fusiondirectory.po b/quota/locale/fr/fusiondirectory.po
index c3e039b2544345418e3c2f6a21631360c76456c3..c9387f534f8eee6ec564b6d9dd0d566687385eac 100644
--- a/quota/locale/fr/fusiondirectory.po
+++ b/quota/locale/fr/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
+# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
 # MCMic, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:07+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,15 +28,15 @@ msgid "Plugin for quota support"
 msgstr "Gestion des quotas utilisateurs"
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr "Informations sur les quotas"
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr "Informations sur les quotas de l'utilisateur"
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Périphérique"
 
@@ -84,149 +84,149 @@ msgstr "Serveur"
 msgid "Server hosting the device this quota is for"
 msgstr "Serveur hébergeant le périphérique sur lequel s'applique le quota"
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr "Service Quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Partages"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr "Quota pour les partages fournis par ce serveur"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr "Périphérique concerné par ce quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr "Taille des blocs pour le quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr "Taille des blocs pour le quota sur ce partage (normalement 1024)"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Commentaire"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr "Court commentaire sur ce quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr "Message d'avertissement du quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Jeu de caractères"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr "Encodage utilisé pour le message"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr "Commande de courriel"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr "Commande permettant au serveur d'envoyer des courriels"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr "Contact du support"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr "Adresse de courriel pour contacter l'administrateur"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "Depuis"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr "Adresse depuis laquelle les courriels seront envoyés"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr "Envoyer une copie à "
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Sujet"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr "Sujet du courriel d'alerte envoyé"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Contenu"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr "Contenu du courriel envoyé"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Signature"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr "Signature à mettre à la fin du courriel"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr "Support des messages LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "Serveur LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr "Serveur LDAP sur lequel se connecter"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr "DN de connexion"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr "DN du compte à utiliser pour la connexion"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr "Mot de passe de connexion"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr "Mot de passe à utiliser pour la connexion"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Avertissement"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Valeur d'encodage invalide : %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s par %s)"
diff --git a/quota/locale/hu_HU/fusiondirectory.po b/quota/locale/hu_HU/fusiondirectory.po
index 06f630fb0edcbc1483830bf480f1eccbed0273d6..0c0e2a15bf09fb7aca6469e6cfe9f126a66f9f06 100644
--- a/quota/locale/hu_HU/fusiondirectory.po
+++ b/quota/locale/hu_HU/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:56+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/id/fusiondirectory.po b/quota/locale/id/fusiondirectory.po
index ecede9c9e154313c6503c5e979ccd165c7b1f1cd..b40dedc3da8e8dfda3c6aa4209eae3220fbc3c8d 100644
--- a/quota/locale/id/fusiondirectory.po
+++ b/quota/locale/id/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:56+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/it_IT/fusiondirectory.po b/quota/locale/it_IT/fusiondirectory.po
index 97c755425eb8f2c533a47c162fc88d6d00335771..bcf8627da0c6c9e5afd23a99f56b18533334792c 100644
--- a/quota/locale/it_IT/fusiondirectory.po
+++ b/quota/locale/it_IT/fusiondirectory.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Paola Penati <penati@avaya.com>, 2015
+# Paola Penati <penati@avaya.com>, 2015-2016
 # Paola Penati <penati@avaya.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:27+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:16+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -28,15 +28,15 @@ msgid "Plugin for quota support"
 msgstr "Plugin per l'uso di Quota"
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr "Informazioni sulla quota"
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr "Informazioni sulla quota di questo utente"
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Dispositivi"
 
@@ -84,149 +84,149 @@ msgstr "Server"
 msgid "Server hosting the device this quota is for"
 msgstr "Server che ospita il dispositivo interessato da questa quota"
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr "Servizio Quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Condivisioni"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr "Quote delle condivisioni ospitate su questo server"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr "Dispositivo interessato da questa quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr "Dimensione della quota di blocco"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr "Dimensione della quota di blocco (di solito 1024)"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Commento"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr "Breve commento circa questa quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr "Messaggio d'avvertimento Quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Set di caratteri"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr "set di caratteri del messaggio"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr "Comando Mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr "Comando che consente al server di inviare le mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr "Contatto per il supporto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr "Indirizzo email per contattare l'amministratore"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "da"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr "Indirizzo e-mail da cui la mail sarà inviata"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr "Invia una copia di questa e-mail a"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Oggetto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr "Soggetto della mail di avvertimento da inviare"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Contenuto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr "Contenuto della e-mail da inviare"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Firma elettronica"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr "Firma elettronica da inserire alla fine della e-mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr "Messaggio di supporto Ldap"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "Server LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr "Il server LDAP a cui connettersi"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr "dn dell'utente con cui connettersi"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr "dn dell'utente da usare per la connessione"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr "password dell'utente che si connette"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr "password dell'utente usato per la connessione"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Valore non valido in codifiche : %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s di %s)"
diff --git a/quota/locale/lv/fusiondirectory.po b/quota/locale/lv/fusiondirectory.po
index 3b1813c2ff824db9b76e02e0f2d8961c0e7840dc..e136d2f852e2398062ecf9c858af85d10626eb8a 100644
--- a/quota/locale/lv/fusiondirectory.po
+++ b/quota/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/nb/fusiondirectory.po b/quota/locale/nb/fusiondirectory.po
index 50aa38505a94d46563e0114bdbfa6174acdb4d6c..ccedb35203b13f592236c6c7c4e9e6d04679347f 100644
--- a/quota/locale/nb/fusiondirectory.po
+++ b/quota/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr "Tjener"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/nl/fusiondirectory.po b/quota/locale/nl/fusiondirectory.po
index dccbf1d4f611b3796c2ed52cf78720996454e2c0..6742a40783d2870ffe843af32ec3830f0a089581 100644
--- a/quota/locale/nl/fusiondirectory.po
+++ b/quota/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr "Plugin voor quota support"
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Apparaat"
 
@@ -82,149 +82,149 @@ msgstr "Server"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr "Quota dienst"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Shares"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Opmerking"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Charset"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "Van"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Inhoud"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Handtekening"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "LDAP server"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/pl/fusiondirectory.po b/quota/locale/pl/fusiondirectory.po
index 177d682eeecdaac68ec892dd3067f88fe33ef0bb..5e7d2bce2e03ad1c2f4aedf5465c892deb124899 100644
--- a/quota/locale/pl/fusiondirectory.po
+++ b/quota/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "UrzÄ…dzenie"
 
@@ -82,149 +82,149 @@ msgstr "Serwer"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Usługi"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Udziały"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Komentarz"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr "Kodowanie"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "Serwer LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/pt/fusiondirectory.po b/quota/locale/pt/fusiondirectory.po
index d5aad312436892a5bc07437a8e952352fa87a577..87973d945bec105693436c3a684484d2f8938b95 100644
--- a/quota/locale/pt/fusiondirectory.po
+++ b/quota/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr "Servidor"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Atenção"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/pt_BR/fusiondirectory.po b/quota/locale/pt_BR/fusiondirectory.po
index e11df72a9aa2f52e9467f40b72f7d1a17759910d..92ad8350d0e28be9470a9c296c46bcee24e27acd 100644
--- a/quota/locale/pt_BR/fusiondirectory.po
+++ b/quota/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -82,149 +82,149 @@ msgstr "servidor"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Serviços"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "Comentar"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "De"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Assunto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Conteúdo"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr "Assinatura"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/ru/fusiondirectory.po b/quota/locale/ru/fusiondirectory.po
index de39686ca38eac79ae61daf7112c6bfe6781fd5f..924471269555cbd050f43f22a252e040b506d5a4 100644
--- a/quota/locale/ru/fusiondirectory.po
+++ b/quota/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-08 19:21+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr "Сервер"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Сервисы"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "Шары"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr "От"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Тема"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Содержимое"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "LDAP-сервер"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/ru@petr1708/fusiondirectory.po b/quota/locale/ru@petr1708/fusiondirectory.po
index f333eeba1dfac82df39f6586bb4c131055eff290..cce41438a7ec38927752ff4c15ede16daa786c90 100644
--- a/quota/locale/ru@petr1708/fusiondirectory.po
+++ b/quota/locale/ru@petr1708/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:56+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/sv/fusiondirectory.po b/quota/locale/sv/fusiondirectory.po
index b3d59875eef2dd1f921ae9e630c99baea99ecc23..6251e2bb554035348934e60d9b14ce5fb5088b6e 100644
--- a/quota/locale/sv/fusiondirectory.po
+++ b/quota/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "Enhet"
 
@@ -82,149 +82,149 @@ msgstr "Server"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "Tjänster"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr "Ämne"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr "Innehåll"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Varning"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/ug/fusiondirectory.po b/quota/locale/ug/fusiondirectory.po
index 994c8c0ed1109d13245270c7f7d5ce5cbae70540..d07394a38d2454cbeb64e5ea6f7578704ea61ab7 100644
--- a/quota/locale/ug/fusiondirectory.po
+++ b/quota/locale/ug/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 15:56+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr ""
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/vi_VN/fusiondirectory.po b/quota/locale/vi_VN/fusiondirectory.po
index 2900988be012379999aea0d0fce54d36124f8d2d..4b6ecfe029424b681b554eda46405f1319c67dfd 100644
--- a/quota/locale/vi_VN/fusiondirectory.po
+++ b/quota/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr ""
 
@@ -82,149 +82,149 @@ msgstr "Máy chủ (server)"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/zh/fusiondirectory.po b/quota/locale/zh/fusiondirectory.po
index cdd449004af91f08cb42ffb368e272a06206034d..a749dd43b6aead47d4e76416e687212f2c074139 100644
--- a/quota/locale/zh/fusiondirectory.po
+++ b/quota/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgid "Plugin for quota support"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
+msgid "Quota information"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
+msgid "Quota information for this user"
 msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:129
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
 msgstr "设备"
 
@@ -82,149 +82,149 @@ msgstr "服务器"
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
+#: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
-#: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:31
+#: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
 msgstr "服务"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:43
+#: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
 msgstr "共享"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:47
+#: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
+#: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device concerned by this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:55
+#: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
 msgstr "注释"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:60
+#: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:73
+#: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:79
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:80
+#: admin/systems/services/quota/class_serviceQuota.inc:83
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:84
+#: admin/systems/services/quota/class_serviceQuota.inc:87
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:88
+#: admin/systems/services/quota/class_serviceQuota.inc:91
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:92
+#: admin/systems/services/quota/class_serviceQuota.inc:95
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:96
+#: admin/systems/services/quota/class_serviceQuota.inc:99
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:100
+#: admin/systems/services/quota/class_serviceQuota.inc:103
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:104
+#: admin/systems/services/quota/class_serviceQuota.inc:107
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:110
+#: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "LDAP server"
 msgstr "LDAP 服务器"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:116
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:117
+#: admin/systems/services/quota/class_serviceQuota.inc:120
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:121
+#: admin/systems/services/quota/class_serviceQuota.inc:124
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 msgid "Warning"
 msgstr "警告"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:154
+#: admin/systems/services/quota/class_serviceQuota.inc:157
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:171
+#: admin/systems/services/quota/class_serviceQuota.inc:174
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/personal/quota/class_quotaAccount.inc b/quota/personal/quota/class_quotaAccount.inc
index 15072fd86940a47b6316e1a01416583ae836ff6a..2d0b82bd38f1b5734d2216915855a063a731fc63 100644
--- a/quota/personal/quota/class_quotaAccount.inc
+++ b/quota/personal/quota/class_quotaAccount.inc
@@ -107,7 +107,7 @@ class quotaAccount extends simplePlugin
       'plObjectType'  => array('user'),
       'plDepends'     => array('posixAccount'),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -117,12 +117,12 @@ class quotaAccount extends simplePlugin
       'main' => array(
         'template'  => get_template_path('quota_section.tpl', TRUE, dirname(__FILE__)),
         'class'     => array('fullwidth'),
-        'name'      => _('Quota informations'),
+        'name'      => _('Quota information'),
         'icon'      => 'geticon.php?context=applications&icon=quota&size=16',
         'attrs'     => array(
           new OrderedArrayAttribute(
             new QuotaEntryAttribute(
-              _('Quota informations for this user'),
+              _('Quota information for this user'),
               'quota',
               array(
                 new SelectAttribute(
diff --git a/repository/admin/repository/class_buildRepository.inc b/repository/admin/repository/class_buildRepository.inc
index 51ae1c51d33183246316087267c576a772698cd3..93cab421f6bcd9c4d1314a0ad1e32d8a5d948c34 100644
--- a/repository/admin/repository/class_buildRepository.inc
+++ b/repository/admin/repository/class_buildRepository.inc
@@ -46,7 +46,7 @@ class buildRepository extends simplePlugin
         ),
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/repository/admin/repository/class_repositoryDistribution.inc b/repository/admin/repository/class_repositoryDistribution.inc
index 4f3c2565dc8e822b1387dfa31c5b6873b67308d5..6b4f36eb4f4fd6c8f83fff860ff590e1992cae11 100644
--- a/repository/admin/repository/class_repositoryDistribution.inc
+++ b/repository/admin/repository/class_repositoryDistribution.inc
@@ -45,7 +45,7 @@ class repositoryDistribution extends simplePlugin
         ),
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/repository/admin/repository/class_repositorySection.inc b/repository/admin/repository/class_repositorySection.inc
index ffe6fea4de1c75a5e539f934100ab1a3afb103bb..d9942b9ca3084348747e79c5828c3afda32330d1 100644
--- a/repository/admin/repository/class_repositorySection.inc
+++ b/repository/admin/repository/class_repositorySection.inc
@@ -42,7 +42,7 @@ class repositorySection extends simplePlugin
         )
       ),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/repository/config/repository/class_repositoryConfig.inc b/repository/config/repository/class_repositoryConfig.inc
index 96da6de64939f36364ac3a8f6efdbf738c912c0f..c2fd9398ef2c370cbce7c204b90036dda7c526fd 100644
--- a/repository/config/repository/class_repositoryConfig.inc
+++ b/repository/config/repository/class_repositoryConfig.inc
@@ -31,7 +31,7 @@ class repositoryConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/repository/locale/ar/fusiondirectory.po b/repository/locale/ar/fusiondirectory.po
index d6ca8aee2c41934aa563e30d9d595b9cb82074c7..731535316b85e53d83877febec155862aca537a8 100644
--- a/repository/locale/ar/fusiondirectory.po
+++ b/repository/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/ca/fusiondirectory.po b/repository/locale/ca/fusiondirectory.po
index 3a23f3d1fa8bc12d536d4684d56b8113ea26387a..23cae8e0866b399a1dbe78a85809686d78680c9b 100644
--- a/repository/locale/ca/fusiondirectory.po
+++ b/repository/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/cs_CZ/fusiondirectory.po b/repository/locale/cs_CZ/fusiondirectory.po
index 53e24560ae08399b022b903f35912071b653b739..cdc17b7e00a3578159df1fa416ac107925725f31 100644
--- a/repository/locale/cs_CZ/fusiondirectory.po
+++ b/repository/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr "Nastavení zásuvného modulu repozitář pro FusionDirectory"
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Repozitář"
 
@@ -125,8 +125,8 @@ msgstr "Uživatelé"
 msgid "Users of this repository"
 msgstr "Uživatelé tohoto repozitáře"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr "Správa repozitáře"
 
diff --git a/repository/locale/de/fusiondirectory.po b/repository/locale/de/fusiondirectory.po
index 78c6115daf34ff0cb30a6e0fa89ebb53f999068a..5d4353a8c628d8c0b249139f8402997787dfbdd3 100644
--- a/repository/locale/de/fusiondirectory.po
+++ b/repository/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Repository"
 
@@ -125,8 +125,8 @@ msgstr "Benutzer"
 msgid "Users of this repository"
 msgstr "Benutzer dieses Repositoriums"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr "Repositoriumsverwaltung"
 
diff --git a/repository/locale/el_GR/fusiondirectory.po b/repository/locale/el_GR/fusiondirectory.po
index b393b50a520d2dacbe99516be0d4ff6acad90aa9..b77883bad5e0fb5d7e7920c3f7dfc3ec275809c4 100644
--- a/repository/locale/el_GR/fusiondirectory.po
+++ b/repository/locale/el_GR/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -29,7 +29,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr "Ρύθμιση προσθέτου του αποθετηρίου FusionDirectory"
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Αποθετήριο"
 
@@ -128,8 +128,8 @@ msgstr "Χρήστες"
 msgid "Users of this repository"
 msgstr "Χρήστες του αποθετηρίου"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr "Διαχείριση αποθετηρίου"
 
diff --git a/repository/locale/en/fusiondirectory.po b/repository/locale/en/fusiondirectory.po
index 1602ed835fe5d5b68b7065a9e27af77a8dcfb904..44853a08ff16020735bb7a37881351b1e25fe850 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: 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"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:38
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: 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 ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/es/fusiondirectory.po b/repository/locale/es/fusiondirectory.po
index f520daee6034f402386f313f3c8c6499e50eb466..04603b6fdc692d4dc81dc3a7c719016721c80ed1 100644
--- a/repository/locale/es/fusiondirectory.po
+++ b/repository/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -125,8 +125,8 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/es_CO/fusiondirectory.po b/repository/locale/es_CO/fusiondirectory.po
index 2446c65cdce426ad3b3d3c0b4606d280b8218aff..cb482a5ebfacd90fee209508dda37e5366e59e44 100644
--- a/repository/locale/es_CO/fusiondirectory.po
+++ b/repository/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/es_VE/fusiondirectory.po b/repository/locale/es_VE/fusiondirectory.po
index 90e3036f85103791dcabff988d429a4e28b4bb78..79c64364b59c948baf46b6fe81702e0570c18609 100644
--- a/repository/locale/es_VE/fusiondirectory.po
+++ b/repository/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -125,8 +125,8 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/fa_IR/fusiondirectory.po b/repository/locale/fa_IR/fusiondirectory.po
index a7ecb2d1efed321a3be15f1447c142ac3a787f75..7cc31f73ff6116493bc13f798077d6ed6da89541 100644
--- a/repository/locale/fa_IR/fusiondirectory.po
+++ b/repository/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/fi_FI/fusiondirectory.po b/repository/locale/fi_FI/fusiondirectory.po
index e84d4ac5e7d7f076aafe6e547d362b51525fc4e7..23a80277b3c5e72978598a5cd18c3aa6c8bdf057 100644
--- a/repository/locale/fi_FI/fusiondirectory.po
+++ b/repository/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/fr/fusiondirectory.po b/repository/locale/fr/fusiondirectory.po
index 4de006f74c5910d911d1149c40a0d3f63c730c22..e8bb8b720f800be2cfc0fd3eab5604af7018d501 100644
--- a/repository/locale/fr/fusiondirectory.po
+++ b/repository/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -27,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr "Configuration du plugin repository"
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Dépôt"
 
@@ -126,8 +126,8 @@ msgstr "Utilisateurs"
 msgid "Users of this repository"
 msgstr "Utilisateurs de ce dépôt"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr "Gestion des dépôts"
 
diff --git a/repository/locale/hu_HU/fusiondirectory.po b/repository/locale/hu_HU/fusiondirectory.po
index 95f41b75fab99e68c835633b18cf6bbc4baa7c95..a8f8df4fc8d9814b1e0832a9165cfa6e352904b6 100644
--- a/repository/locale/hu_HU/fusiondirectory.po
+++ b/repository/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr "Felhasználók"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/id/fusiondirectory.po b/repository/locale/id/fusiondirectory.po
index ff47868e60b9070578a3b6d5b1cb666314030f98..1bde64a3a07dcd2a9b75192750c81d8934cfd362 100644
--- a/repository/locale/id/fusiondirectory.po
+++ b/repository/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/it_IT/fusiondirectory.po b/repository/locale/it_IT/fusiondirectory.po
index 2bed70fd65b97f22306c2e0c4340410b316ef721..7daa2500a95da1eafe4122f75ed9fcfa024af6db 100644
--- a/repository/locale/it_IT/fusiondirectory.po
+++ b/repository/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:27+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -28,7 +28,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr "Configurazione del plugin Repository di FusionDirectory"
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Deposito"
 
@@ -127,8 +127,8 @@ msgstr "Utenti"
 msgid "Users of this repository"
 msgstr "Utenti di questo repository"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr "Gestione di Repository"
 
diff --git a/repository/locale/lv/fusiondirectory.po b/repository/locale/lv/fusiondirectory.po
index 57813c38451cb5fb7fd28f66dcf1c86acb6f67be..ad4344c3eb845f244aae25f2834bac1f303e6e72 100644
--- a/repository/locale/lv/fusiondirectory.po
+++ b/repository/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Krātuve "
 
@@ -125,8 +125,8 @@ msgstr "Lietotāji"
 msgid "Users of this repository"
 msgstr "Šīs krātuves lietotāji"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/nb/fusiondirectory.po b/repository/locale/nb/fusiondirectory.po
index 3326f22e82f13ad83500b6fce2f353560f38f826..e50c03ec1501cfc5fd85e1a0e0999d3d32d7c9fb 100644
--- a/repository/locale/nb/fusiondirectory.po
+++ b/repository/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/nl/fusiondirectory.po b/repository/locale/nl/fusiondirectory.po
index e97fd8a4c0dc807dc9d6d89bc4babc9ef4d52b2f..fa3c4b52e02ae9ada914c4c85dc76cf0d28dc8e5 100644
--- a/repository/locale/nl/fusiondirectory.po
+++ b/repository/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Verzamelplaats"
 
@@ -125,8 +125,8 @@ msgstr "Gebruikers"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/pl/fusiondirectory.po b/repository/locale/pl/fusiondirectory.po
index 9c360765024ccd93ae42352bf8a03af705ae0dc8..15fc8e9434ce56dec95e89c916646ab0d8125b25 100644
--- a/repository/locale/pl/fusiondirectory.po
+++ b/repository/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Repozytorium"
 
@@ -125,8 +125,8 @@ msgstr "Użytkownicy"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/pt/fusiondirectory.po b/repository/locale/pt/fusiondirectory.po
index 26df0190417dec2398a5cfa7d752de52183f6391..fef56aaa6736d403e6731cedeb8d6a0266ae4733 100644
--- a/repository/locale/pt/fusiondirectory.po
+++ b/repository/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr "Usuários"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/pt_BR/fusiondirectory.po b/repository/locale/pt_BR/fusiondirectory.po
index e1f07db57b9c4ecce311f0edd94541c4f2cc5650..a96ef4378adabab43430a1442642c13261d3484e 100644
--- a/repository/locale/pt_BR/fusiondirectory.po
+++ b/repository/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr "Configuração do plugin de repositório do FusionDirectory"
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Repositório"
 
@@ -125,8 +125,8 @@ msgstr "Usuários"
 msgid "Users of this repository"
 msgstr "Usuários deste repositório"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr "Gerenciamento de repositório"
 
diff --git a/repository/locale/ru/fusiondirectory.po b/repository/locale/ru/fusiondirectory.po
index e1ad7a6dbab4f9f4666c485f190e605bed26fd35..3ec21e4de0287973583dcfd8e6aeed2331c90278 100644
--- a/repository/locale/ru/fusiondirectory.po
+++ b/repository/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr "Пользователи"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/ru@petr1708/fusiondirectory.po b/repository/locale/ru@petr1708/fusiondirectory.po
index 1e9d32d57041f73dec4d81374852a5d8e4d95d9e..8baf006a967a8bc9731b6a371d3f4b97221a38f4 100644
--- a/repository/locale/ru@petr1708/fusiondirectory.po
+++ b/repository/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/sv/fusiondirectory.po b/repository/locale/sv/fusiondirectory.po
index ac709f61e3e08e74f7f955c43a35a1185d8226e9..632f84a5f1b59e69c87e9c0a9bab9f7404758b1a 100644
--- a/repository/locale/sv/fusiondirectory.po
+++ b/repository/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "Förråd"
 
@@ -125,8 +125,8 @@ msgstr "Användare"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/ug/fusiondirectory.po b/repository/locale/ug/fusiondirectory.po
index f4d7305a46126c762c9c593f23dee72be89843df..be4ff8b73feddf9c04b00814d858ca1e974ab489 100644
--- a/repository/locale/ug/fusiondirectory.po
+++ b/repository/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/vi_VN/fusiondirectory.po b/repository/locale/vi_VN/fusiondirectory.po
index 75ecacfec925503e7cc7b2115fec947057199d84..124b6860caa1656f2463246cb41ff0e050970984 100644
--- a/repository/locale/vi_VN/fusiondirectory.po
+++ b/repository/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr "Người dùng"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/zh/fusiondirectory.po b/repository/locale/zh/fusiondirectory.po
index f629c7a064761d0017ef64c71c65fb298f4ded79..3e6c4c4f6128182754195e86e08aed52fe818ff4 100644
--- a/repository/locale/zh/fusiondirectory.po
+++ b/repository/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:40
+#: admin/repository/class_repositoryManagement.inc:38
 msgid "Repository"
 msgstr "仓库"
 
@@ -125,8 +125,8 @@ msgstr "用户"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
+#: admin/repository/class_repositoryManagement.inc:32
+#: admin/repository/class_repositoryManagement.inc:33
 msgid "Repository management"
 msgstr ""
 
diff --git a/samba/admin/groups/samba/class_sambaGroup.inc b/samba/admin/groups/samba/class_sambaGroup.inc
index 994e1f20b3ff5879cb1a7a26870e940592e22dce..0141cda37b98bc2ccfe5d8cd6085182b2392bef3 100644
--- a/samba/admin/groups/samba/class_sambaGroup.inc
+++ b/samba/admin/groups/samba/class_sambaGroup.inc
@@ -31,7 +31,7 @@ class sambaGroup extends simplePlugin
       'plSelfModify'  => FALSE,
       'plObjectType'  => array('group'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -46,7 +46,7 @@ class sambaGroup extends simplePlugin
             'sambaDomainName', TRUE
           ),
           new CompositeAttribute(
-            _('Samba informations'),
+            _('Samba information'),
             'sambaSID',
             array(
               new HiddenAttribute(
diff --git a/samba/admin/samba/class_sambaDomain.inc b/samba/admin/samba/class_sambaDomain.inc
index de3e086e1f6491a17c3a6262e69f0a08d780aaba..9aa7563f499702a57e0c397dd4a278864befb105 100644
--- a/samba/admin/samba/class_sambaDomain.inc
+++ b/samba/admin/samba/class_sambaDomain.inc
@@ -40,7 +40,7 @@ class sambaDomain extends simplePlugin
         )
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/samba/admin/systems/samba/class_winstationGeneric.inc b/samba/admin/systems/samba/class_winstationGeneric.inc
index 0a6002f70a446b1a431e769a8eb4ce363ccbf7b3..7b6d9d170c1c639fca45bf65339c4012d79c5e6f 100644
--- a/samba/admin/systems/samba/class_winstationGeneric.inc
+++ b/samba/admin/systems/samba/class_winstationGeneric.inc
@@ -30,7 +30,7 @@ class winstationGeneric extends systemSimplePluginGlue
 
   var $preInitAttributes = array('uid', 'cn', 'networkSettings');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -47,7 +47,7 @@ class winstationGeneric extends systemSimplePluginGlue
         )
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/samba/config/samba/class_sambaPluginConfig.inc b/samba/config/samba/class_sambaPluginConfig.inc
index 8015cea48a9942b2ccb54c7f91c598b0e76a8379..48786fb7e4b1b5b1b02f13689c257f73d266a330 100644
--- a/samba/config/samba/class_sambaPluginConfig.inc
+++ b/samba/config/samba/class_sambaPluginConfig.inc
@@ -30,7 +30,7 @@ class sambaPluginConfig extends simplePlugin
       "plPriority"      => 2,
       "plObjectType"    => array("configuration"),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/samba/locale/ar/fusiondirectory.po b/samba/locale/ar/fusiondirectory.po
index b55cdc597201e8a08a14ed2bc854092d6ead7f44..2a9c6c33763704ed29ab1eac6ae95889a3375ab0 100644
--- a/samba/locale/ar/fusiondirectory.po
+++ b/samba/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/ca/fusiondirectory.po b/samba/locale/ca/fusiondirectory.po
index 96c63eb2cc63d7b5b335ac9938af7144b418255e..84cec3c6f0b7990cdc890bbfd9934e6a0870f67f 100644
--- a/samba/locale/ca/fusiondirectory.po
+++ b/samba/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/cs_CZ/fusiondirectory.po b/samba/locale/cs_CZ/fusiondirectory.po
index da27ac1a0e99f408978ad76d06ad28e8878383d8..289fbd4f82dfe2dd4f0300bbdb8f191b56b5801f 100644
--- a/samba/locale/cs_CZ/fusiondirectory.po
+++ b/samba/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -411,8 +411,8 @@ msgid "Samba domain"
 msgstr "Samba doména"
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Informace o službě Samba"
+msgid "Samba information"
+msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
 msgid "Group type"
@@ -455,11 +455,11 @@ msgstr "Ve stávajícím nastavení se nedaří nalézt SID skupiny!"
 msgid "Special group (%d)"
 msgstr "Zvláštní skupina (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr "Domény Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr "Správa Samba domény"
 
diff --git a/samba/locale/de/fusiondirectory.po b/samba/locale/de/fusiondirectory.po
index fc7b2f06c570377c26e286cf3b629b890bf01870..883e5af44d6e1295c143f1c683d706481de5c5b1 100644
--- a/samba/locale/de/fusiondirectory.po
+++ b/samba/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -411,8 +411,8 @@ msgid "Samba domain"
 msgstr "Samba-Domäne"
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Samba-Informationen"
+msgid "Samba information"
+msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
 msgid "Group type"
@@ -455,11 +455,11 @@ msgstr "Kann keine Gruppen-SID in Ihrer Konfiguration finden!"
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr "Samba-Domänen"
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr "Samba-Domänenverwaltung"
 
diff --git a/samba/locale/el_GR/fusiondirectory.po b/samba/locale/el_GR/fusiondirectory.po
index 327340dbc37a1babf85a4a82bdbc40fc0844fa56..a28e652bfa9a5c6aa9631be9d14b2ccfa22a0902 100644
--- a/samba/locale/el_GR/fusiondirectory.po
+++ b/samba/locale/el_GR/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -414,8 +414,8 @@ msgid "Samba domain"
 msgstr "Τομέας Samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Πληροφορίες Samba"
+msgid "Samba information"
+msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
 msgid "Group type"
@@ -458,11 +458,11 @@ msgstr "Δεν μπορεί να βρεθεί το SID της ομάδας στ
 msgid "Special group (%d)"
 msgstr "Ειδική ομάδα (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr "Τομείς Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr "Διαχείριση Τομέα Samba"
 
diff --git a/samba/locale/en/fusiondirectory.po b/samba/locale/en/fusiondirectory.po
index 28978fe8814c25216424a7dd2933d428d4e8a369..96b0957a96b80a4fadeed30ab3a1d84aedf658a1 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can "
+"retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of "
+"the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba information"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:33
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomainManagement.inc:34
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can "
-"retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of "
-"the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/es/fusiondirectory.po b/samba/locale/es/fusiondirectory.po
index 811c62e0c3352abb7476f8b73947b1e07aa87ce4..63164d04aeaf15abbfd60402598b325a27e1110d 100644
--- a/samba/locale/es/fusiondirectory.po
+++ b/samba/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/es_CO/fusiondirectory.po b/samba/locale/es_CO/fusiondirectory.po
index ff8cb0b05db1bfd56be342c61f906db24cda76ba..10c4c04994bbfd970ff64b468ea886fce06905f4 100644
--- a/samba/locale/es_CO/fusiondirectory.po
+++ b/samba/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/es_VE/fusiondirectory.po b/samba/locale/es_VE/fusiondirectory.po
index b53114093f46d6c3bfad376a644e02157d9f633a..c3c1d64ae853412615a4a0bbee9f7f7040c5d9bb 100644
--- a/samba/locale/es_VE/fusiondirectory.po
+++ b/samba/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/fa_IR/fusiondirectory.po b/samba/locale/fa_IR/fusiondirectory.po
index fb590b048dfcfc5839682f13eeee488fc3b7ec15..3c5fbb97c111dfc5e264493a11b18aa141777ef7 100644
--- a/samba/locale/fa_IR/fusiondirectory.po
+++ b/samba/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/fi_FI/fusiondirectory.po b/samba/locale/fi_FI/fusiondirectory.po
index cf4391ae13d4273b19467a848f106b624634ad74..914283f88352ba7f303260a96549a09c0a164315 100644
--- a/samba/locale/fi_FI/fusiondirectory.po
+++ b/samba/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/fr/fusiondirectory.po b/samba/locale/fr/fusiondirectory.po
index 5f335c7e86e87271580f7d0e5f570d92bdf49461..737952b4a75b47af3e641ac114f1d00b437959df 100644
--- a/samba/locale/fr/fusiondirectory.po
+++ b/samba/locale/fr/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-15 15:34+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:09+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -413,8 +413,8 @@ msgid "Samba domain"
 msgstr "Domaine Samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Informations Samba"
+msgid "Samba information"
+msgstr "Informations samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:56
 msgid "Group type"
@@ -457,11 +457,11 @@ msgstr "Impossible de trouver le SID de ce groupe dans votre configuration !"
 msgid "Special group (%d)"
 msgstr "Groupe spécial (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr "Domaines Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr "Gestion des domaines Samba"
 
diff --git a/samba/locale/hu_HU/fusiondirectory.po b/samba/locale/hu_HU/fusiondirectory.po
index e1704bc1b35a9b05a870f789cd1487cdd270056c..4f575481da4a4a2adc81005ba492ce178425ad78 100644
--- a/samba/locale/hu_HU/fusiondirectory.po
+++ b/samba/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/id/fusiondirectory.po b/samba/locale/id/fusiondirectory.po
index b66f93565bcaa753f4e8066545b74be6b5426121..2bc24969ac906a724db7abd87f645a88acb866e3 100644
--- a/samba/locale/id/fusiondirectory.po
+++ b/samba/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/it_IT/fusiondirectory.po b/samba/locale/it_IT/fusiondirectory.po
index df40490c62862187d5d1a35cb860072855dafc48..cd88551b3cafba08e06ed87b115c59bd5adf8689 100644
--- a/samba/locale/it_IT/fusiondirectory.po
+++ b/samba/locale/it_IT/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-10-03 15:47+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:21+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -414,7 +414,7 @@ msgid "Samba domain"
 msgstr "Nome di dominio di Samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr "Informazioni su Samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -458,11 +458,11 @@ msgstr "Impossibile trovare il SID del gruppo nella tua configurazione !"
 msgid "Special group (%d)"
 msgstr "Gruppo speciale (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr "Nomi di dominio di Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr "Gestione di dominio di Samba"
 
diff --git a/samba/locale/lv/fusiondirectory.po b/samba/locale/lv/fusiondirectory.po
index 086b6c6e14125957e68b3460f9e66cfb248dc9da..3e454f1fa9107a25519b2f09eb4bd2edb9062424 100644
--- a/samba/locale/lv/fusiondirectory.po
+++ b/samba/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/nb/fusiondirectory.po b/samba/locale/nb/fusiondirectory.po
index 5335750f4934c335093eefe6649ab2f213c2c2a6..de86a4cb46bfa4f0b82225c925212bdad4697d4c 100644
--- a/samba/locale/nb/fusiondirectory.po
+++ b/samba/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/nl/fusiondirectory.po b/samba/locale/nl/fusiondirectory.po
index 18be8d5eae7f5687b51e9276ef60f916f8f64846..8b123a7dae8e5005f5ec6e5ef90e68c9e0c673a1 100644
--- a/samba/locale/nl/fusiondirectory.po
+++ b/samba/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr "Kan de goep SID niet vinden in je configuratie!"
 msgid "Special group (%d)"
 msgstr "Speciale groep (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/pl/fusiondirectory.po b/samba/locale/pl/fusiondirectory.po
index 5f4568f8b90165737f560bfff5f583c7e44bd3b0..28314e4e0471318bc1dd47aa45caa6d78c81bfae 100644
--- a/samba/locale/pl/fusiondirectory.po
+++ b/samba/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr "Specjalna grupa (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/pt/fusiondirectory.po b/samba/locale/pt/fusiondirectory.po
index 3bf878d2aa738708c556e1b33dbdd00e1577b375..a4ef67475c08ed938764592c56f957473a5328fc 100644
--- a/samba/locale/pt/fusiondirectory.po
+++ b/samba/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/pt_BR/fusiondirectory.po b/samba/locale/pt_BR/fusiondirectory.po
index c30658e6887a222599c581afa07c2818996e56ff..21ab884b716c4b9dcd7b70dd466d00d7647063b3 100644
--- a/samba/locale/pt_BR/fusiondirectory.po
+++ b/samba/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr "Não foi possível encontrar grupo SID na sua configuração!"
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/ru/fusiondirectory.po b/samba/locale/ru/fusiondirectory.po
index fc4d59185b179dacc35db370305ecd6596dc05c1..9a0fcfe5336144df7aeac7a0ed5084971af9a25b 100644
--- a/samba/locale/ru/fusiondirectory.po
+++ b/samba/locale/ru/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -413,7 +413,7 @@ msgid "Samba domain"
 msgstr "Домен Samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -457,11 +457,11 @@ msgstr "Не могу найти SID группы в вашей конфигур
 msgid "Special group (%d)"
 msgstr "Специальная группа (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr "Домены Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr "Управление доменами Samba"
 
diff --git a/samba/locale/ru@petr1708/fusiondirectory.po b/samba/locale/ru@petr1708/fusiondirectory.po
index 2a9ff0d1cbaa50a76d7b5bc3c6046e0a294b81e3..68ed9fc7c61b124be0ef9ec1fa8eacf94e441a9d 100644
--- a/samba/locale/ru@petr1708/fusiondirectory.po
+++ b/samba/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/sv/fusiondirectory.po b/samba/locale/sv/fusiondirectory.po
index bd804c262ef160c95a6210199a0e40092390a0b9..eb94baaa4d525f2c8b8457208956695211b204ba 100644
--- a/samba/locale/sv/fusiondirectory.po
+++ b/samba/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr "Kan inte hitta grupp-SID i konfigurationen"
 msgid "Special group (%d)"
 msgstr "Specialgrupp (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/ug/fusiondirectory.po b/samba/locale/ug/fusiondirectory.po
index e2e91cd78db329773efd09687c71308a682ca3a7..884d5d093fc4efe3542eae628c1a8756d66c4684 100644
--- a/samba/locale/ug/fusiondirectory.po
+++ b/samba/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/vi_VN/fusiondirectory.po b/samba/locale/vi_VN/fusiondirectory.po
index 468f128da62a3139499b1e9cefc87bc216c6d997..450744138d1f24b1c8518fba345dcd67a41662ea 100644
--- a/samba/locale/vi_VN/fusiondirectory.po
+++ b/samba/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr "Không thể tìm được nhóm SID trong cấu hình của bạn!"
 msgid "Special group (%d)"
 msgstr "Nhóm đặc biệt (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/locale/zh/fusiondirectory.po b/samba/locale/zh/fusiondirectory.po
index 1fc33186c18e08a1094c5a23368b60855b80494d..8545f0a581baf17c808cac3cd2ddbcdc9a7d1d0e 100644
--- a/samba/locale/zh/fusiondirectory.po
+++ b/samba/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgid "Samba domain"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+msgid "Samba information"
 msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:56
@@ -455,11 +455,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr "特殊组 (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:35
+#: admin/samba/class_sambaDomainManagement.inc:33
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domain management"
 msgstr ""
 
diff --git a/samba/personal/samba/class_sambaAccount.inc b/samba/personal/samba/class_sambaAccount.inc
index 298d90906d672066a4a0705e848a58eb2e8e4b93..e9cee911252ba60dfb16bb916ca388d72ee85625 100644
--- a/samba/personal/samba/class_sambaAccount.inc
+++ b/samba/personal/samba/class_sambaAccount.inc
@@ -164,7 +164,7 @@ class sambaAccount extends simplePlugin
       'plPriority'      => 5,
       'plObjectType'    => array('user'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sogo/admin/sogo/class_sogoResource.inc b/sogo/admin/sogo/class_sogoResource.inc
index 671ce3b7b405c64e5bfbdf675363df9ed441237b..9add3a6dc61803936f218ea7187ab06a7f40204b 100644
--- a/sogo/admin/sogo/class_sogoResource.inc
+++ b/sogo/admin/sogo/class_sogoResource.inc
@@ -24,7 +24,7 @@ class sogoResource extends simplePlugin
 
   var $objectclasses = array('inetOrgPerson','top','CalendarResource');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling */
   public static function plInfo()
   {
     return array(
@@ -40,7 +40,7 @@ class sogoResource extends simplePlugin
         'mainAttr'    => 'uid'
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sogo/config/sogo/class_sogoConfig.inc b/sogo/config/sogo/class_sogoConfig.inc
index 5f6750f83a5cbc96bbfe25e3bc9516f3daa6357a..f48dad75a88723f57dcf52aa179eea1c0c74f76d 100644
--- a/sogo/config/sogo/class_sogoConfig.inc
+++ b/sogo/config/sogo/class_sogoConfig.inc
@@ -31,7 +31,7 @@ class sogoConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sogo/locale/ar/fusiondirectory.po b/sogo/locale/ar/fusiondirectory.po
index a3f2accec428c158420d0e6ee9fc010213fdfcb3..b4f8ab85e75272439c06311a50734731333a386e 100644
--- a/sogo/locale/ar/fusiondirectory.po
+++ b/sogo/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/ca/fusiondirectory.po b/sogo/locale/ca/fusiondirectory.po
index faf82fbea9d569f9ce87fd207ac55ac8e524d13e..8c050ae73cd317394dbdf0200dd2768096293138 100644
--- a/sogo/locale/ca/fusiondirectory.po
+++ b/sogo/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/cs_CZ/fusiondirectory.po b/sogo/locale/cs_CZ/fusiondirectory.po
index 644aeb78d1f8f0a30693b5d23e3fa910bd2cfe57..ea034591c20091096abcf4684016a14b4b207edc 100644
--- a/sogo/locale/cs_CZ/fusiondirectory.po
+++ b/sogo/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -25,8 +25,8 @@ msgstr "Nastavení SOGo"
 msgid "FusionDirectory sogo plugin configuration"
 msgstr "Nastavení zásuvného modulu sogo pro FusionDirectory"
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr "Druh"
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr "Správa SOGo"
diff --git a/sogo/locale/de/fusiondirectory.po b/sogo/locale/de/fusiondirectory.po
index 23f5d585aa87fe6d9b8c1086e2bdb43ea205f07d..b309773dff08738a99b1b2cca6b321995b5d536d 100644
--- a/sogo/locale/de/fusiondirectory.po
+++ b/sogo/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -26,8 +26,8 @@ msgstr "SOGo-Konfiguration"
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -68,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr "Art"
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr "SOGo-Verwaltung"
diff --git a/sogo/locale/el_GR/fusiondirectory.po b/sogo/locale/el_GR/fusiondirectory.po
index 387cdeadc35e7f74cb506268dca00fa468ba2397..7765a08f42abed149f36fb64aa5c78a8831cf8a8 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -26,8 +26,8 @@ msgstr "Ρύθμιση SOGo"
 msgid "FusionDirectory sogo plugin configuration"
 msgstr "Ρύθμιση προσθέτου FusionDirectory sogo"
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -68,6 +68,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Είδος"
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr "Διαχείριση SOGo"
diff --git a/sogo/locale/en/fusiondirectory.po b/sogo/locale/en/fusiondirectory.po
index 5455951dbb35516fbdff0ddc9956d961a11918a8..74ee093930a02069955c28d2eedb3d80b598e572 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: 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"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/es/fusiondirectory.po b/sogo/locale/es/fusiondirectory.po
index 727ee5d651cb76fd6c05d9c43950a7d8f98a19d8..5cb4c3dd64a395e2e51bd3f6063e9a2ebfe43855 100644
--- a/sogo/locale/es/fusiondirectory.po
+++ b/sogo/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/es_CO/fusiondirectory.po b/sogo/locale/es_CO/fusiondirectory.po
index 76e605b9a729edf618eb143f77d4c883beba03be..66d2015ffac871c5d3587dfc810c58885e8b0b1e 100644
--- a/sogo/locale/es_CO/fusiondirectory.po
+++ b/sogo/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/es_VE/fusiondirectory.po b/sogo/locale/es_VE/fusiondirectory.po
index 5816a30fe7aed115edd16dfc94faef3c9cb8532a..37d6a5d67676272742002241fdc297e3831399c6 100644
--- a/sogo/locale/es_VE/fusiondirectory.po
+++ b/sogo/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/fa_IR/fusiondirectory.po b/sogo/locale/fa_IR/fusiondirectory.po
index bce9e6b440f0364c9e0317022f11825e3e1da75f..2a90bba988405fb9f39234ceb1128be42ffc997d 100644
--- a/sogo/locale/fa_IR/fusiondirectory.po
+++ b/sogo/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/fi_FI/fusiondirectory.po b/sogo/locale/fi_FI/fusiondirectory.po
index 1952c37696185f03560b0740b5d6b02b253c5be2..f927c4d7cae0a9ad8839f9f89b9bde35a3a959e6 100644
--- a/sogo/locale/fi_FI/fusiondirectory.po
+++ b/sogo/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/fr/fusiondirectory.po b/sogo/locale/fr/fusiondirectory.po
index b17deddfc8ade0c4e60f197b5b7abda794c28740..8e051a4eae46a46896680846fc05131c03400038 100644
--- a/sogo/locale/fr/fusiondirectory.po
+++ b/sogo/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -27,8 +27,8 @@ msgstr "Configuration de SOGo"
 msgid "FusionDirectory sogo plugin configuration"
 msgstr "Configuration du plugin SOGo"
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -69,6 +69,6 @@ msgstr "Réservations multiples"
 msgid "Kind"
 msgstr "Type"
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr "Gestion SOGo"
diff --git a/sogo/locale/hu_HU/fusiondirectory.po b/sogo/locale/hu_HU/fusiondirectory.po
index 4028bb794dcf060ddd5120c8be2d5e78869f5402..17eeabbf588896a3b65960956235264659318bbf 100644
--- a/sogo/locale/hu_HU/fusiondirectory.po
+++ b/sogo/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/id/fusiondirectory.po b/sogo/locale/id/fusiondirectory.po
index 3eef7aa78eed1d6fb4fc3a1aebb52c6d3d37a9e6..06115acc1a5e12bddeea7c86c0bf78bba703edb8 100644
--- a/sogo/locale/id/fusiondirectory.po
+++ b/sogo/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/it_IT/fusiondirectory.po b/sogo/locale/it_IT/fusiondirectory.po
index 893f1850f93c53b7c77cfb8cc06996129c0f9cfa..07e7bf0a4994868b20017d3278c006307f3fff2d 100644
--- a/sogo/locale/it_IT/fusiondirectory.po
+++ b/sogo/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:28+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -27,8 +27,8 @@ msgstr "Configurazione di SOGo"
 msgid "FusionDirectory sogo plugin configuration"
 msgstr "Configurazione del plugin sogo di FusionDirectory"
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -69,6 +69,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Tipo"
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr "Gestione di SOGo"
diff --git a/sogo/locale/lv/fusiondirectory.po b/sogo/locale/lv/fusiondirectory.po
index c62a6ca826b52f9107b5b15b486655588ca65b54..41179ec1cb814e5f0a58cb0d119ee1f366bef4d4 100644
--- a/sogo/locale/lv/fusiondirectory.po
+++ b/sogo/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/nb/fusiondirectory.po b/sogo/locale/nb/fusiondirectory.po
index b001d901c7bc3fad4d6ca4c3eb3703fc48d80173..4b1bbe8197d5cdc803ddb6a156cdbb0db2c944e1 100644
--- a/sogo/locale/nb/fusiondirectory.po
+++ b/sogo/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/nl/fusiondirectory.po b/sogo/locale/nl/fusiondirectory.po
index c3242d74b85451a8e55b150b62194eba5ab9b60c..70558864141a59754a7245366a535135e7f8f660 100644
--- a/sogo/locale/nl/fusiondirectory.po
+++ b/sogo/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/pl/fusiondirectory.po b/sogo/locale/pl/fusiondirectory.po
index 7e63b100cbdeff2eabe58b78133a24c2f06d0750..7a6c13b58a9ca54146fa56addc9b8542f5331f6b 100644
--- a/sogo/locale/pl/fusiondirectory.po
+++ b/sogo/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/pt/fusiondirectory.po b/sogo/locale/pt/fusiondirectory.po
index b50d37a9b986f1cfdc40d79ed3d28087ff6ee487..a158a9b3571bf839b1b82d28001f1ce63367a5d0 100644
--- a/sogo/locale/pt/fusiondirectory.po
+++ b/sogo/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/pt_BR/fusiondirectory.po b/sogo/locale/pt_BR/fusiondirectory.po
index c44cd2f4f3181dea3a4e96e92f24f4d0bcaa1dd1..b9937cae9c8bedbd0cdd5bdc256d85dbb48167fa 100644
--- a/sogo/locale/pt_BR/fusiondirectory.po
+++ b/sogo/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -25,8 +25,8 @@ msgstr "Configuração de SOGo"
 msgid "FusionDirectory sogo plugin configuration"
 msgstr "Configuração do plugin FusionDirectory sogo"
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -67,6 +67,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Tipo"
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr "Gerenciar SOGo"
diff --git a/sogo/locale/ru/fusiondirectory.po b/sogo/locale/ru/fusiondirectory.po
index 09876ef57e062cecbdf6900299df5257288548c2..a36016c2820d448aa473879a5cb0717f5b8cc8a4 100644
--- a/sogo/locale/ru/fusiondirectory.po
+++ b/sogo/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/ru@petr1708/fusiondirectory.po b/sogo/locale/ru@petr1708/fusiondirectory.po
index 9dc600e7790941e774d5a86b62b5d39f8eb8ed2f..293da5c1c5e8599a4f4c8f146364dee71a409b48 100644
--- a/sogo/locale/ru@petr1708/fusiondirectory.po
+++ b/sogo/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/sv/fusiondirectory.po b/sogo/locale/sv/fusiondirectory.po
index 8b4c840f4f48ba7519c36232f232a34da26ce31a..c872925c16a009451eb4bafc81fb2dbda62ebec5 100644
--- a/sogo/locale/sv/fusiondirectory.po
+++ b/sogo/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/ug/fusiondirectory.po b/sogo/locale/ug/fusiondirectory.po
index 7104f25743a43cc7492146b4c8b0355a9039ab2b..3c92fccdd0a8af74576a799a39ced5bc51899243 100644
--- a/sogo/locale/ug/fusiondirectory.po
+++ b/sogo/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/vi_VN/fusiondirectory.po b/sogo/locale/vi_VN/fusiondirectory.po
index 88c05c541310832f95f94eaa796f80cad175fc43..f4a146af849d26a26ec4b4833a125765c761bd0f 100644
--- a/sogo/locale/vi_VN/fusiondirectory.po
+++ b/sogo/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/zh/fusiondirectory.po b/sogo/locale/zh/fusiondirectory.po
index 4a3765c2e5d2f385c91cb3edfa51824a76ba576f..eaffe12545bcdac79476d8673a5d802348afcc16 100644
--- a/sogo/locale/zh/fusiondirectory.po
+++ b/sogo/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
+#: admin/sogo/class_sogoManagement.inc:37
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:35
+#: admin/sogo/class_sogoManagement.inc:33
 msgid "SOGo management"
 msgstr ""
diff --git a/spamassassin/admin/systems/services/spam/class_serviceSpamAssassin.inc b/spamassassin/admin/systems/services/spam/class_serviceSpamAssassin.inc
index c81e86ea96854e0f650277ce33df277e8bd9610e..473e3da8198ad9de560c76601b30783de2144c51 100644
--- a/spamassassin/admin/systems/services/spam/class_serviceSpamAssassin.inc
+++ b/spamassassin/admin/systems/services/spam/class_serviceSpamAssassin.inc
@@ -25,8 +25,6 @@ class serviceSpamAssassin extends simpleService {
   /* This plugin only writes its objectClass */
   var $objectclasses = array('goSpamServer');
 
-    /* Return plugin informations for acl handling  */
-
   static function plInfo()
   {
     return array(
@@ -34,7 +32,7 @@ class serviceSpamAssassin extends simpleService {
       'plDescription' => _('Spamassassin service').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=applications&icon=spamassassin&size=16',
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/spamassassin/locale/ar/fusiondirectory.po b/spamassassin/locale/ar/fusiondirectory.po
index b1f099d655d8825cf2015585aca5e446f8045b63..6f5c67da882aa8f888f280161b97619666202bea 100644
--- a/spamassassin/locale/ar/fusiondirectory.po
+++ b/spamassassin/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "خدمات"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "قواعد"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "قاعدة"
diff --git a/spamassassin/locale/ca/fusiondirectory.po b/spamassassin/locale/ca/fusiondirectory.po
index 3daa3e03fd640411a041b0e5602a730a494d077f..71ea950d1a5bf1f9c0dd1b1066b896a200c02db8 100644
--- a/spamassassin/locale/ca/fusiondirectory.po
+++ b/spamassassin/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nom"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/cs_CZ/fusiondirectory.po b/spamassassin/locale/cs_CZ/fusiondirectory.po
index 04ae11f55742c19014ff2bc3d20a877d89cf885d..123bbc1e6bcd853e6cb3fc7600b2e477d21b6041 100644
--- a/spamassassin/locale/cs_CZ/fusiondirectory.po
+++ b/spamassassin/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr "Služba Spamassassin"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Služby"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr "Označování nevyžádané pošty"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Přepsat hlavičku"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Potřebný stupeň hodnocení"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Zvolte stupeň hodnocení, po jehož dosažení bude zpráva považována za nevyžádanou"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "Důvěryhodné sítě"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr "Příznaky"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Používat k filtrování zpráv algoritmus Bayes"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Používat samoučící režim algoritmu Bayes"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "Zapnout kontrolu RBL"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Používat Razor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr "Zapnout používání DCC"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Používat Pyzor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Pravidla"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr "Upravit pravidlo pro nevyžádanou poštu"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Název"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Pravidlo"
diff --git a/spamassassin/locale/de/fusiondirectory.po b/spamassassin/locale/de/fusiondirectory.po
index 4c80295fde6c121ee8e033af1c8c2d245c6998d0..98c6a88ccd7f531c3ab192fefc90324bde26d848 100644
--- a/spamassassin/locale/de/fusiondirectory.po
+++ b/spamassassin/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr "Spamassassin-Dienst"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr "Spam Tagging"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Nachrichtenkopf bearbeiten"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Benötigter Wert"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Wählen Sie den gewünschten Wert, ab dem Mail als Spam gekennzeichnet wird."
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "gesicherte Netzwerke"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr "Flags"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Bayes-Filterung verwenden"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Bayes lernt automatisch"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "RBL prüfen"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Razor verwenden"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Pyzor verwenden"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Regeln"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr "Spamregel bearbeiten"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Name"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Regel"
diff --git a/spamassassin/locale/el_GR/fusiondirectory.po b/spamassassin/locale/el_GR/fusiondirectory.po
index bbba4d6d6684154a9669f4618d125f74f38775c6..26e71d8b14b9af350793f9d901eb7f19b960b7e2 100644
--- a/spamassassin/locale/el_GR/fusiondirectory.po
+++ b/spamassassin/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr "Υπηρεσία Spamassassin"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Υπηρεσίες"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr "Σήμανση spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Επαναγραφή κεφαλίδας"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Απαιτούμενη βαθμολογία"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Επιλέξτε την απαιτούμενη βαθμολογία για να χαρακτηριστεί ένα μήνυμα ως spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "Έμπιστα δίκτυα"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr "Σημάνσεις"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Επιτρέπεται η χρήση φίλτρου bayes"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Επιτρέπεται η αυτόματη εκπαίδευση bayes"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "Επιτρέπονται έλεγχοι σε λίστες RBL"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Επιτρέπεται η χρήση Razor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr "Επιτρέπεται η χρήση DCC"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Επιτρέπεται η χρήση Pyzor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Κανόνες"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr "Επεξεργασία κανόνα spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Κανόνας"
diff --git a/spamassassin/locale/en/fusiondirectory.po b/spamassassin/locale/en/fusiondirectory.po
index 59402ffa01b7b046cdf3e862b72040aab9112907..5be860e1c5b926d0fa160e35689fce31c289e74d 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,112 +17,112 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
-msgid "Spamassassin service"
+#: personal/spamassassin/class_spamAssassinAccount.inc:31
+msgid "Spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
-msgid "Services"
+#: personal/spamassassin/class_spamAssassinAccount.inc:38
+msgid "SpamAssassin user preferences settings"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
-msgid "Spam tagging"
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "Directive"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
-msgid "Rewrite header"
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "The name of a SpamAssassin configuration directive"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
-msgid "Required score"
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "Value"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
-msgid "Select required score to tag mail as spam"
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "The value for the directive"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
-msgid "Trusted networks"
+#: personal/spamassassin/class_spamAssassinAccount.inc:54
+msgid "SpamAssassin user rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
-msgid "Flags"
+#: personal/spamassassin/class_spamAssassinAccount.inc:65
+msgid "SpamAssassin"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
-msgid "Enable use of bayes filtering"
+#: personal/spamassassin/class_spamAssassinAccount.inc:66
+msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
-msgid "Enable bayes auto learning"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
+msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
-msgid "Enable RBL checks"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
-msgid "Enable use of Razor"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
+msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
-msgid "Enable use of DCC"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
+msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
-msgid "Enable use of Pyzor"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
+msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
-msgid "Rules"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
+msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
-msgid "Edit spam rule"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
+msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
-msgid "Name"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
+msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
-msgid "Rule"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
+msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:31
-msgid "Spam rules"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
+msgid "Enable bayes auto learning"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:38
-msgid "SpamAssassin user preferences settings"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
+msgid "Enable RBL checks"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:42
-msgid "Directive"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
+msgid "Enable use of Razor"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:42
-msgid "The name of a SpamAssassin configuration directive"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
+msgid "Enable use of DCC"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:47
-msgid "Value"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
+msgid "Enable use of Pyzor"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:47
-msgid "The value for the directive"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
+msgid "Rules"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:54
-msgid "SpamAssassin user rules"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
+msgid "Edit spam rule"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:65
-msgid "SpamAssassin"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
+msgid "Name"
 msgstr ""
 
-#: personal/spamassassin/class_spamAssassinAccount.inc:66
-msgid "Edit user's spam rules"
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
+msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/es/fusiondirectory.po b/spamassassin/locale/es/fusiondirectory.po
index 8b9945c965a7ad86f6e6465c7a8994cc83a963ba..7a7dce4e376073bcc8f38a06e2e4ed810d158e85 100644
--- a/spamassassin/locale/es/fusiondirectory.po
+++ b/spamassassin/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Reescribir cabecera"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Puntuación mínima"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Indique la puntuación necesaria para marcar el correo como spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "Redes de confianza"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Activar el uso de filtros bayesianos"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Activar aprendizaje bayesiano"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "Activas comprobaciones RBL"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Activar usar Razor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Activar uso de Pyzor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Reglas"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Papel desempeñado"
diff --git a/spamassassin/locale/es_CO/fusiondirectory.po b/spamassassin/locale/es_CO/fusiondirectory.po
index e3766e0f83b478fb5b125d7f8126ea4a7bd45538..d7a2ee73dbdf9d9927bc55c67edaa46f0bf21376 100644
--- a/spamassassin/locale/es_CO/fusiondirectory.po
+++ b/spamassassin/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/es_VE/fusiondirectory.po b/spamassassin/locale/es_VE/fusiondirectory.po
index 271164bb3480a0f1658f8b3f6ebe531ec045af68..8d687026be983f8d176fe607ad7cbd6121f66f24 100644
--- a/spamassassin/locale/es_VE/fusiondirectory.po
+++ b/spamassassin/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Reescribir cabecera"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Puntuación mínima"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Indique la puntuación necesaria para marcar el correo como spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "Redes de confianza"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Activar el uso de filtros bayesianos"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Activar aprendizaje bayesiano"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "Activas comprobaciones RBL"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Activar usar Razor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Activar uso de Pyzor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Reglas"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Papel desempeñado"
diff --git a/spamassassin/locale/fa_IR/fusiondirectory.po b/spamassassin/locale/fa_IR/fusiondirectory.po
index 80b86feceee3e111115e4c59bcc5bd5e68806588..c928260644e5df2b3e743b4c5d9a81829b861eb6 100644
--- a/spamassassin/locale/fa_IR/fusiondirectory.po
+++ b/spamassassin/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/fi_FI/fusiondirectory.po b/spamassassin/locale/fi_FI/fusiondirectory.po
index da0cde3e39d0d3a4c1b68abb12a103bc1fdfd946..4db903132b004fb43d4675c9d876879d15e43fbb 100644
--- a/spamassassin/locale/fi_FI/fusiondirectory.po
+++ b/spamassassin/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-13 13:29+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Palvelut"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/fr/fusiondirectory.po b/spamassassin/locale/fr/fusiondirectory.po
index 793f1e48c98caabe1284a072b1f5baa1d5fcd92f..f485c2a57d83e7c9ce07b73d9a6ae41515a9e86c 100644
--- a/spamassassin/locale/fr/fusiondirectory.po
+++ b/spamassassin/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:26+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -54,76 +54,76 @@ msgstr "SpamAssassin"
 msgid "Edit user's spam rules"
 msgstr "Éditer les règles courrier indésirable"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr "Service Spamassassin"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr "Niveau de spam pour marquage"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Récrire l'entête"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Score requis"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Sélectionner le score requis pour marquer un message comme étant un spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "Réseaux de confiance"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr "Drapeaux"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Activer l'utilisation de la méthode de filtrage bayésienne"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Activer l'apprentissage automatique pour la méthode bayésienne"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "Activer les vérifications RBL"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Activer l'utilisation de Razor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr "Activer l'utilisation de DCC"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Activer l'utilisation de Pyzor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Règles"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr "Éditer la règle anti-spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nom"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Règle"
diff --git a/spamassassin/locale/hu_HU/fusiondirectory.po b/spamassassin/locale/hu_HU/fusiondirectory.po
index dec9220241bec311f422e59da949ac6b3adc548a..6db8c7d63a614dd0ed75f2a61d2b348e72a2e2fc 100644
--- a/spamassassin/locale/hu_HU/fusiondirectory.po
+++ b/spamassassin/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Név"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/id/fusiondirectory.po b/spamassassin/locale/id/fusiondirectory.po
index a279b1435f06d3cd30dd2153b482548e71b21ee6..55a771e0614cf9da755c3aec286f5227cbf24717 100644
--- a/spamassassin/locale/id/fusiondirectory.po
+++ b/spamassassin/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/it_IT/fusiondirectory.po b/spamassassin/locale/it_IT/fusiondirectory.po
index d5fe65ffd813e0d99c3ac1ceac318c52b506ca2d..51be27dfdea4acad93fc817efa5271cf84373a9a 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:28+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -54,76 +54,76 @@ msgstr "SpamAssassin"
 msgid "Edit user's spam rules"
 msgstr "Modifica le regole dello spam per l'utente"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr "Servizio Spamassassin"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr "Etichettatura dello spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Riscrivi l'intestazione"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Punteggio richiesto"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Scegli il punteggio richiesto per etichettare un messaggio come spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "Reti affidabili"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr "Flags"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Attiva l'uso del metodo di filtraggio bayesiano"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Attiva l'apprendimento automatico per il metodo bayesiano"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "Attiva le verifiche RBL"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Attiva l'uso di Razor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr "Attiva l'uso di DCC"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Attiva l'uso di Pyzor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Regole"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr "Modifica regola dello spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nome"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Regola"
diff --git a/spamassassin/locale/lv/fusiondirectory.po b/spamassassin/locale/lv/fusiondirectory.po
index ad445ec0c671f61c92fb5cc20a42ac4603d9a29a..d56f51ccbf3264967d690b1a29fbc7297ad88079 100644
--- a/spamassassin/locale/lv/fusiondirectory.po
+++ b/spamassassin/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/nb/fusiondirectory.po b/spamassassin/locale/nb/fusiondirectory.po
index 6f1737dae115068e903ec118419b162b625bf571..31867dab76a2348ca6c5466e231107cd4ac83965 100644
--- a/spamassassin/locale/nb/fusiondirectory.po
+++ b/spamassassin/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Navn"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/nl/fusiondirectory.po b/spamassassin/locale/nl/fusiondirectory.po
index f5626b84a2a2283f529a79cc9dce5bf1af4e2d19..534e50a8a18a3178ad0929e0eba3c657e2b0d14c 100644
--- a/spamassassin/locale/nl/fusiondirectory.po
+++ b/spamassassin/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr "Spamassassin dienst"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Herschrijf header"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Vereist score"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Selecteer vereiste score om mail als spam te markeren"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "Vertrouwde netwerken"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Activeer het gebruik van bayes filtering"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Activeer bayes auto learning"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "Activeer RBL checks"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Active gebruik van Razor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Activeer gebuik van Pyzor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Regel"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Naam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Regel"
diff --git a/spamassassin/locale/pl/fusiondirectory.po b/spamassassin/locale/pl/fusiondirectory.po
index a00cd83b8a9a3ca897f64a04337fefe466cdea34..976cf616cbf6422ea35841bc883bfd047cb577af 100644
--- a/spamassassin/locale/pl/fusiondirectory.po
+++ b/spamassassin/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Usługi"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/pt/fusiondirectory.po b/spamassassin/locale/pt/fusiondirectory.po
index bfb03d63f54263c95230cb8d0bc7ec2fbea1c61b..d0ffe1f589db48f58e57f03894bdcceec5c0ffbc 100644
--- a/spamassassin/locale/pt/fusiondirectory.po
+++ b/spamassassin/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nome"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/pt_BR/fusiondirectory.po b/spamassassin/locale/pt_BR/fusiondirectory.po
index d5a8d872d4cbfbc9ae20bd6b75fc2fba4a2276dc..3b6bdb88f1718a213e1078ce4b4c5b6ea116c7ea 100644
--- a/spamassassin/locale/pt_BR/fusiondirectory.po
+++ b/spamassassin/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr "Serviço contra spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Serviços"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr "Marcação de spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "Rescrever cabeçalho"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "Pontuação requerida"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "Selecionar pontuação requerida para definir correio como spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr "Redes confiáveis"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr "Bandeiras"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "Habilitar uso de filtragem de bayes"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "Habilitar o auto aprendizado bayes"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "Habilitar checagem RBL"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "Habilitar uso de Razor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr "Habilitar uso de Pyzor"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr "Regras"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr "Editar regra de spam"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Nome"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "Regra"
diff --git a/spamassassin/locale/ru/fusiondirectory.po b/spamassassin/locale/ru/fusiondirectory.po
index cc488d47dc268dd2d731f6b93dfa8bb2755868ea..bc4caf5ee78547047c820eae8ffba0f863349a80 100644
--- a/spamassassin/locale/ru/fusiondirectory.po
+++ b/spamassassin/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Сервисы"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr "Flags"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Название"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/ru@petr1708/fusiondirectory.po b/spamassassin/locale/ru@petr1708/fusiondirectory.po
index 4ff8e870de800d370e12ab6cae1396c59d24ff53..b9a55cb7e66fffc2ee986e6f743b9119a5c72340 100644
--- a/spamassassin/locale/ru@petr1708/fusiondirectory.po
+++ b/spamassassin/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/sv/fusiondirectory.po b/spamassassin/locale/sv/fusiondirectory.po
index 7fbdf6425e9e8528d7926aa6404ba7f6050feda6..6935737a67da43f70655ac4aa8b0bf0dfc0160df 100644
--- a/spamassassin/locale/sv/fusiondirectory.po
+++ b/spamassassin/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "Tjänster"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Namn"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/ug/fusiondirectory.po b/spamassassin/locale/ug/fusiondirectory.po
index 53897eee815287a5ecf834ff8ace80cb19745a96..87aafcb7b12644f1e9dcb6a0f8f61f2e91e4b2a1 100644
--- a/spamassassin/locale/ug/fusiondirectory.po
+++ b/spamassassin/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/vi_VN/fusiondirectory.po b/spamassassin/locale/vi_VN/fusiondirectory.po
index 0c99e194f871698f4cad844d1212be39eb141fea..5f0a7c37a9dedcac0fbc01d57d6bec56ca82308a 100644
--- a/spamassassin/locale/vi_VN/fusiondirectory.po
+++ b/spamassassin/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "Tên"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr ""
diff --git a/spamassassin/locale/zh/fusiondirectory.po b/spamassassin/locale/zh/fusiondirectory.po
index 544eadb1ea796e31fc41a49d8fbd66856fe07e02..eaa49eff1e4d1d953f5c471e0ca00a3cb0392c12 100644
--- a/spamassassin/locale/zh/fusiondirectory.po
+++ b/spamassassin/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -53,76 +53,76 @@ msgstr ""
 msgid "Edit user's spam rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Spamassassin service"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
 msgstr "服务"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:51
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
 msgstr "重写信头"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
 msgstr "需要的分数"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:55
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
 msgstr "选择将邮件标记为垃圾邮件需要的分值"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:61
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:68
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:71
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
 msgstr "启用 bayes 过滤"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:76
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
 msgstr "启用 bayes 自动学习"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:81
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
 msgstr "启用 RBL 检查"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:86
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
 msgstr "启用 Razor 的使用"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:91
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:96
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:111
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:115
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:123
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
 msgid "Edit spam rule"
 msgstr ""
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:118
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
 msgstr "名称"
 
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
 msgstr "规则"
diff --git a/spamassassin/personal/spamassassin/class_spamAssassinAccount.inc b/spamassassin/personal/spamassassin/class_spamAssassinAccount.inc
index 9f900aa487d7db9badc1e6b46fef75b77ec96717..66f870d20f23f61218d46bbd71f4264a77c70e52 100644
--- a/spamassassin/personal/spamassassin/class_spamAssassinAccount.inc
+++ b/spamassassin/personal/spamassassin/class_spamAssassinAccount.inc
@@ -69,7 +69,7 @@ class spamAssassinAccount extends simplePlugin
       'plIcon'          => 'geticon.php?context=applications&icon=spamassassin&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=spamassassin&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 }
diff --git a/squid/locale/ar/fusiondirectory.po b/squid/locale/ar/fusiondirectory.po
index 5930087672c2fcb28708e7834be5d1e66f8c1889..717f8c4aabba19d620640873066183560ad51040 100644
--- a/squid/locale/ar/fusiondirectory.po
+++ b/squid/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/squid/locale/ca/fusiondirectory.po b/squid/locale/ca/fusiondirectory.po
index 258dca7ed9ceee98ac47b9242cd7accb7924eccc..84c938e4a723f6da9a86d21d2c3d11100f7cdb1a 100644
--- a/squid/locale/ca/fusiondirectory.po
+++ b/squid/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/squid/locale/cs_CZ/fusiondirectory.po b/squid/locale/cs_CZ/fusiondirectory.po
index 484c7010018c97a4fb1f8517f22d0466d21bd3c9..86267684c2f13228a486a2aec78988b4073f0caa 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/squid/locale/de/fusiondirectory.po b/squid/locale/de/fusiondirectory.po
index 8ca39831fd879ee7265fa69a792eeb4a2838f24c..f5e32cbfd14c47f1a96edb2cb7c233a2eb063b9d 100644
--- a/squid/locale/de/fusiondirectory.po
+++ b/squid/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/squid/locale/el_GR/fusiondirectory.po b/squid/locale/el_GR/fusiondirectory.po
index 770698b66efda7517d18165eec9f722251ac6acc..82ea7f614220771b22eaff3e9d376188d75e1faa 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/squid/locale/en/fusiondirectory.po b/squid/locale/en/fusiondirectory.po
index 0b34ca668c5ebd8d6d682562fd13dba8b8f31dff..7aef654d7348646f73e238432153f31c8ee993ef 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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 625d4c8ad9ca9159e5c3e92108d2e4794efc7986..adea5c44e3348113931d15fb0f6755b302b1e8d3 100644
--- a/squid/locale/es/fusiondirectory.po
+++ b/squid/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/squid/locale/es_CO/fusiondirectory.po b/squid/locale/es_CO/fusiondirectory.po
index bb2afda020b003a9adbfe276536b0248ab3c26c9..7a180afd816c7106b630b1f5f74667fe585eb368 100644
--- a/squid/locale/es_CO/fusiondirectory.po
+++ b/squid/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/squid/locale/es_VE/fusiondirectory.po b/squid/locale/es_VE/fusiondirectory.po
index 0987975754e5e4b5ca421f5aaeff4c5b23dc4055..8787208424b859cf43f841af0d604621daf5346f 100644
--- a/squid/locale/es_VE/fusiondirectory.po
+++ b/squid/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/squid/locale/fa_IR/fusiondirectory.po b/squid/locale/fa_IR/fusiondirectory.po
index 8bbe65b508f1ec9d01b1134fe1360cd9f8d561aa..b609280193f1e353050d15259cabd65ce4891595 100644
--- a/squid/locale/fa_IR/fusiondirectory.po
+++ b/squid/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/squid/locale/fi_FI/fusiondirectory.po b/squid/locale/fi_FI/fusiondirectory.po
index 9f8774e2fa5de1554c40ba4083ee349651f89ecf..f6befd386463943a572a91c4ed95e656a092c8ac 100644
--- a/squid/locale/fi_FI/fusiondirectory.po
+++ b/squid/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/squid/locale/fr/fusiondirectory.po b/squid/locale/fr/fusiondirectory.po
index 609f89575fccd103efe9761c1d86b8739c8b6064..010639e5c3223ac78dea6e9f4132477370b2bd65 100644
--- a/squid/locale/fr/fusiondirectory.po
+++ b/squid/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/squid/locale/hu_HU/fusiondirectory.po b/squid/locale/hu_HU/fusiondirectory.po
index 72716e7c963970f04302ca10554552e834535d64..0b84ba061f86ed401705331bb49fac08581c7857 100644
--- a/squid/locale/hu_HU/fusiondirectory.po
+++ b/squid/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/squid/locale/id/fusiondirectory.po b/squid/locale/id/fusiondirectory.po
index bec94cd3e7444391b3e09717aa95101871fe2007..6a3379fbebd9200f7e8bdfad03608b25123f8154 100644
--- a/squid/locale/id/fusiondirectory.po
+++ b/squid/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/squid/locale/it_IT/fusiondirectory.po b/squid/locale/it_IT/fusiondirectory.po
index e5fbf24c29352c871f9e9ecd0b0c26ea10a9463e..1790d22c0f3e7d44edef290039c825d1422a435e 100644
--- a/squid/locale/it_IT/fusiondirectory.po
+++ b/squid/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:28+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/squid/locale/lv/fusiondirectory.po b/squid/locale/lv/fusiondirectory.po
index 0ab42505265c23c932665b42e27cdc42230f955a..d02191bd2f3efc37e2e064ae92c893ce11befc99 100644
--- a/squid/locale/lv/fusiondirectory.po
+++ b/squid/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/squid/locale/nb/fusiondirectory.po b/squid/locale/nb/fusiondirectory.po
index decc31e838cbb29527968498534554a931f8de10..757e1cb82200b5f2c1a9ac635deef45d91d4cf4c 100644
--- a/squid/locale/nb/fusiondirectory.po
+++ b/squid/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/squid/locale/nl/fusiondirectory.po b/squid/locale/nl/fusiondirectory.po
index d23e74d1cf8d3cbaba919c2656cdb9271e1961b4..e972a34942d820013232d1b327aad81d58734cf7 100644
--- a/squid/locale/nl/fusiondirectory.po
+++ b/squid/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/squid/locale/pl/fusiondirectory.po b/squid/locale/pl/fusiondirectory.po
index 94e7dcc903764f2634153b832fda389419b6957e..b882348ebcd209fa15b536d9f969f65097846b48 100644
--- a/squid/locale/pl/fusiondirectory.po
+++ b/squid/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/squid/locale/pt/fusiondirectory.po b/squid/locale/pt/fusiondirectory.po
index 6b0890b6a2cb357145da2545b6d11a11e8b51d4d..a332fbc3c851cd6e704027876becc379ff5e5a98 100644
--- a/squid/locale/pt/fusiondirectory.po
+++ b/squid/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/squid/locale/pt_BR/fusiondirectory.po b/squid/locale/pt_BR/fusiondirectory.po
index b09e95f06b4a0c1fe413cf885b034ba97ba242dc..a5a3e4296fd090cd24aaacf33f4504e2fc4d398e 100644
--- a/squid/locale/pt_BR/fusiondirectory.po
+++ b/squid/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/squid/locale/ru/fusiondirectory.po b/squid/locale/ru/fusiondirectory.po
index 15cc2e4d176a5c77233accc1291d3b5b64b3417e..52dd7b29f8a97d940b65cb36868a24c2f889aa4a 100644
--- a/squid/locale/ru/fusiondirectory.po
+++ b/squid/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/squid/locale/ru@petr1708/fusiondirectory.po b/squid/locale/ru@petr1708/fusiondirectory.po
index 2fc2e73a7225c1f03d544ea86db87027acd9d27d..f5b60c688799aa6f8ca5a98125e635c5a3955a1f 100644
--- a/squid/locale/ru@petr1708/fusiondirectory.po
+++ b/squid/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/squid/locale/sv/fusiondirectory.po b/squid/locale/sv/fusiondirectory.po
index 7ce359d125a0ba81f052f3ac6e842d37758d4e16..1eca7fae34ab5cde02ae3376fc6aa6bc029445b0 100644
--- a/squid/locale/sv/fusiondirectory.po
+++ b/squid/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/squid/locale/ug/fusiondirectory.po b/squid/locale/ug/fusiondirectory.po
index 2456f573af6e0ef9d20371734e8e41da57561f61..1b6847d03ba5af009c1a855ea252b6d83bb63611 100644
--- a/squid/locale/ug/fusiondirectory.po
+++ b/squid/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/squid/locale/vi_VN/fusiondirectory.po b/squid/locale/vi_VN/fusiondirectory.po
index a001816b8c57f9ee34cc2df29adb3ee659ea9b01..f08d12ba487f36ad1e0aa0cd91e59e948f392f4e 100644
--- a/squid/locale/vi_VN/fusiondirectory.po
+++ b/squid/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/squid/locale/zh/fusiondirectory.po b/squid/locale/zh/fusiondirectory.po
index 907156cd66fcc0e56b7ff2e7e7ec004939e7deaa..566f6452643348b0ffdb1b11d8551eef5dd78272 100644
--- a/squid/locale/zh/fusiondirectory.po
+++ b/squid/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/squid/personal/squid/class_proxyAccount.inc b/squid/personal/squid/class_proxyAccount.inc
index e6f6b6b628f8f322d16a6e3b43b745dbb3aa9716..a7d129b3ab9dea1c0a52662099693b6b2cddbc73 100644
--- a/squid/personal/squid/class_proxyAccount.inc
+++ b/squid/personal/squid/class_proxyAccount.inc
@@ -70,7 +70,7 @@ class proxyAccount extends simplePlugin
       'plPriority'      => 9,
       'plObjectType'    => array('user'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/ssh/locale/ar/fusiondirectory.po b/ssh/locale/ar/fusiondirectory.po
index b39eefa2db9bced1c500b86506e434392e0c1723..afdbfcd01b27f73046e77cbf45c65df7034fdb61 100644
--- a/ssh/locale/ar/fusiondirectory.po
+++ b/ssh/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -25,23 +25,23 @@ msgstr "خطأ أثناء الرفع"
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "مفاتيح القشرة الآمنة"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "قشرة آمنة"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/ca/fusiondirectory.po b/ssh/locale/ca/fusiondirectory.po
index e45ce03eabb03083f80b973821e9af4868099b6a..d4dd2f8eae9ce18fc5b4d63950b2c18808f7bcb3 100644
--- a/ssh/locale/ca/fusiondirectory.po
+++ b/ssh/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/cs_CZ/fusiondirectory.po b/ssh/locale/cs_CZ/fusiondirectory.po
index 7a4128ea6a6bc5a43d0debf035e8e6a88c269d82..eb9256d09ae46af5e11d0ba5148eae21f613d006 100644
--- a/ssh/locale/cs_CZ/fusiondirectory.po
+++ b/ssh/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -25,23 +25,23 @@ msgstr "Chyba při nahrávání na protějšek"
 msgid "Unknown public key format!"
 msgstr "Neznámý formát dat veřejné části klíče!"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "SSH klíče"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr "Veřejné části SSH klíčů tohoto uživatele"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr "Upravit veřejné části SSH klíčů tohoto uživatele"
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Chyba : otisku %s odpovídá hned několik klíčů"
diff --git a/ssh/locale/de/fusiondirectory.po b/ssh/locale/de/fusiondirectory.po
index 41042f6ebe1df91cb52eaa1512556064f68fc6b7..08c3c5b2cb8560a2557f2dbdd53624adbd1de31b 100644
--- a/ssh/locale/de/fusiondirectory.po
+++ b/ssh/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -25,23 +25,23 @@ msgstr "Ãœbertragung fehlgeschlagen!"
 msgid "Unknown public key format!"
 msgstr "Unbekanntes Format für öffentliche Schlüssel!"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "SSH Schlüssel"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr "Öffentliche SSH-Schlüssel für diesen Benutzer"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr "Die öffentlichen Schlüssel dieses Benutzers bearbeiten"
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Fehler : Es gibt mehrere Schlüssel mit Fingerprint %s"
diff --git a/ssh/locale/el_GR/fusiondirectory.po b/ssh/locale/el_GR/fusiondirectory.po
index 10349b588db4f61ce377afe024a1bbddedc36de6..dfe95537d53d759389adbac3e263dfa4238c3995 100644
--- a/ssh/locale/el_GR/fusiondirectory.po
+++ b/ssh/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -27,23 +27,23 @@ msgstr "Σφάλμα αποστολής"
 msgid "Unknown public key format!"
 msgstr "Άγνωστη μορφή δημόσιου κλειδιού"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "Κλειδιά SSH"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr "Δημόσια κλειδιά SSH για αυτόν τον χρήστη"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr "Επεξεργασία δημόσιων κλειδιών SSH χρήστη"
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Σφάλμα: υπάρχουν αρκετά κλειδιά με το αποτύπωμα %s"
diff --git a/ssh/locale/en/fusiondirectory.po b/ssh/locale/en/fusiondirectory.po
index aeee6273b3dd0ec16991660f86976dcf7e900941..09ccca3660d501b7fef3c0371cfe1436decf58e2 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/es/fusiondirectory.po b/ssh/locale/es/fusiondirectory.po
index 76a73537602ea2094959dce4faf16ce804bf3b48..db43e0b3db1608dcd2c2b668df4bf0ccb3278240 100644
--- a/ssh/locale/es/fusiondirectory.po
+++ b/ssh/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -25,23 +25,23 @@ msgstr "Error al subir"
 msgid "Unknown public key format!"
 msgstr "Formato de llave pública desconocido!"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/es_CO/fusiondirectory.po b/ssh/locale/es_CO/fusiondirectory.po
index 775fda3f3fc15ae2e1c9997624bbc5bd89c6e9d0..5550c96ffa2bab845ac3a395bdd58b665fd0c4c8 100644
--- a/ssh/locale/es_CO/fusiondirectory.po
+++ b/ssh/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/es_VE/fusiondirectory.po b/ssh/locale/es_VE/fusiondirectory.po
index 0dadb1be520e9c9769603824a9b6340307cfcc87..0054a0aa02f41925460439923ad96b35abbcb319 100644
--- a/ssh/locale/es_VE/fusiondirectory.po
+++ b/ssh/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -25,23 +25,23 @@ msgstr "Error al subir"
 msgid "Unknown public key format!"
 msgstr "Formato de llave pública desconocido!"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/fa_IR/fusiondirectory.po b/ssh/locale/fa_IR/fusiondirectory.po
index 0ed7544494b4155fc32dbe159566194e57558aa6..b57e7c6d48418cb5a825a655c701fcb5afd624e8 100644
--- a/ssh/locale/fa_IR/fusiondirectory.po
+++ b/ssh/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/fi_FI/fusiondirectory.po b/ssh/locale/fi_FI/fusiondirectory.po
index 5e32a349d793a679d9b42b193a4de7d728d0c576..d762c88b105386b02d3a93207c4d1716de3adca3 100644
--- a/ssh/locale/fi_FI/fusiondirectory.po
+++ b/ssh/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/fr/fusiondirectory.po b/ssh/locale/fr/fusiondirectory.po
index 19ac3b229057a40677aee867c00abfceaae62e68..9936775117fbbb01b1373b67c5e56e7237bf11aa 100644
--- a/ssh/locale/fr/fusiondirectory.po
+++ b/ssh/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -26,23 +26,23 @@ msgstr "Erreur de téléversement"
 msgid "Unknown public key format!"
 msgstr "Format de clef inconnu !"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "Clefs SSH"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr "Clefs SSH publiques pour cet utilisateur"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr "Editer les clefs SSH de l'utilisateur"
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Erreur : Il y a plusieurs clés avec l'empreinte %s"
diff --git a/ssh/locale/hu_HU/fusiondirectory.po b/ssh/locale/hu_HU/fusiondirectory.po
index 5d970a3e55c336cd5f34f3ea7221e248f077c845..9e222f530e3818b1c369550b3f589d5e14bb254b 100644
--- a/ssh/locale/hu_HU/fusiondirectory.po
+++ b/ssh/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/id/fusiondirectory.po b/ssh/locale/id/fusiondirectory.po
index 0dd1cb05bd0d976cafa60b2273d578628e3654d6..64b171d181e431e35680c01cd6efde640653e5ca 100644
--- a/ssh/locale/id/fusiondirectory.po
+++ b/ssh/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/it_IT/fusiondirectory.po b/ssh/locale/it_IT/fusiondirectory.po
index d289eae0461325bb9646f9c4af730da60a681f56..15d1d9bf09c95257df73b08c1419806ae0510795 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:29+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -26,23 +26,23 @@ msgstr "Errore di caricamento"
 msgid "Unknown public key format!"
 msgstr "Formato di chiave pubblica sconosciuto!"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "Chiavi SSH"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr "Chiavi pubbliche SSH per questo utente"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr "Modifica le chiavi pubbliche SSH dell'utente"
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Errore : ci sono più chiavi con  l'impronta %s"
diff --git a/ssh/locale/lv/fusiondirectory.po b/ssh/locale/lv/fusiondirectory.po
index 968708d4f92427a938a873c969faccc8a0957430..6f9f87ce965099e7a83e39b956e978d0af3c36b4 100644
--- a/ssh/locale/lv/fusiondirectory.po
+++ b/ssh/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/nb/fusiondirectory.po b/ssh/locale/nb/fusiondirectory.po
index 889f155bddea3bb2762a196796d9a4c02b797854..3f4921a125bdf9ebbfdcf28bb4c047d32840a39d 100644
--- a/ssh/locale/nb/fusiondirectory.po
+++ b/ssh/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/nl/fusiondirectory.po b/ssh/locale/nl/fusiondirectory.po
index 4acce729e5d98f1e761fdb2cb88ac5c9264d6dbc..12318a5045d5769767b6fdb0b1e4f70a4cc0c96e 100644
--- a/ssh/locale/nl/fusiondirectory.po
+++ b/ssh/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -25,23 +25,23 @@ msgstr "Upload fout"
 msgid "Unknown public key format!"
 msgstr "Onbekende publieke sleutel formaat"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "SSH sleutels"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr "SSH publieke sleutels voor deze gebruiker"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr "Wijzig de gebruiker zijn SSH publieke sleutels"
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Error : er zijn verschillende sleutels met de vingerafdruk %s"
diff --git a/ssh/locale/pl/fusiondirectory.po b/ssh/locale/pl/fusiondirectory.po
index 6145fa6cf8b727d03c2d2f8c3b2f50e6657a997c..e6b2dc0a2c43e9aab273598a50b31aa2301d77d3 100644
--- a/ssh/locale/pl/fusiondirectory.po
+++ b/ssh/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/pt/fusiondirectory.po b/ssh/locale/pt/fusiondirectory.po
index b45f54c51affb43415f8dad1c121588b7a0b24cd..9e91d5923f5f6c0070d1123d0efa30e602ba8194 100644
--- a/ssh/locale/pt/fusiondirectory.po
+++ b/ssh/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/pt_BR/fusiondirectory.po b/ssh/locale/pt_BR/fusiondirectory.po
index 3e7fa6202b110589ef8c9ff22695e86eaae5c528..2770ed21bd0ce4ab278d3847f39f4083b603de15 100644
--- a/ssh/locale/pt_BR/fusiondirectory.po
+++ b/ssh/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -25,23 +25,23 @@ msgstr "Erro em upload"
 msgid "Unknown public key format!"
 msgstr "Formato de chave pública desconhecido!"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "Chaves SSH"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr "Chaves públicas de SSH para este usuário"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr "Editar chaves públicas do usuário"
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Erro: existem muitas chaves com impressão %s"
diff --git a/ssh/locale/ru/fusiondirectory.po b/ssh/locale/ru/fusiondirectory.po
index 64b332d878a896eff620e5d62dc4eef5edb90d5f..fae3614cf860d0d59b2137c0c4ac4a2906159fd3 100644
--- a/ssh/locale/ru/fusiondirectory.po
+++ b/ssh/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-11 15:54+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -27,23 +27,23 @@ msgstr "Ошибка загрузки"
 msgid "Unknown public key format!"
 msgstr "Неизвестный формат публичного ключа!"
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr "SSH ключи"
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr "Публичные SSH ключи для этого пользователя"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr "Редактировать публичные ключи SSH пользователя"
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Ошибка: есть несколько ключей с отпечатками %s"
diff --git a/ssh/locale/ru@petr1708/fusiondirectory.po b/ssh/locale/ru@petr1708/fusiondirectory.po
index ff3ab2b33cd60fff62f963d9489724838dd3cd6b..67044b771b93317d65c2da7b57cd85a2602f435d 100644
--- a/ssh/locale/ru@petr1708/fusiondirectory.po
+++ b/ssh/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/sv/fusiondirectory.po b/ssh/locale/sv/fusiondirectory.po
index 749d9430f9d10d4057822e33bab9dbf0809507da..92d08d3520d37281bb6985fa2766224c5a510679 100644
--- a/ssh/locale/sv/fusiondirectory.po
+++ b/ssh/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/ug/fusiondirectory.po b/ssh/locale/ug/fusiondirectory.po
index 0f10d9993cb1d77300cdbed1b4c62e9e9a6e81da..cabc989e4798dc138b23fd29764551114791436b 100644
--- a/ssh/locale/ug/fusiondirectory.po
+++ b/ssh/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/vi_VN/fusiondirectory.po b/ssh/locale/vi_VN/fusiondirectory.po
index cb35f91114c4e01d1a48eaf5d659df859989fb7e..a3fbe4f0adaaebcc20e26cefde0fbcbc85c146ff 100644
--- a/ssh/locale/vi_VN/fusiondirectory.po
+++ b/ssh/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/zh/fusiondirectory.po b/ssh/locale/zh/fusiondirectory.po
index 2b80f15fc252d21aed5b45e2054157e9d00c8619..c9f6ce0a048e6a6fb42919c08d3a80909d2d9730 100644
--- a/ssh/locale/zh/fusiondirectory.po
+++ b/ssh/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:81
+#: personal/ssh/class_sshAccount.inc:80
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:87
+#: personal/ssh/class_sshAccount.inc:86
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:100
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:102
+#: personal/ssh/class_sshAccount.inc:101
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:124
+#: personal/ssh/class_sshAccount.inc:123
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/personal/ssh/class_sshAccount.inc b/ssh/personal/ssh/class_sshAccount.inc
index dc2dccbbdee6bd120cb03ab828299a51ef0fe25c..f6334c748b3f6ec65c61ac4b3cec9a75c6107fba 100644
--- a/ssh/personal/ssh/class_sshAccount.inc
+++ b/ssh/personal/ssh/class_sshAccount.inc
@@ -21,7 +21,7 @@
 
 class SSHPublicKeyAttribute extends FileTextAreaAttribute
 {
-  /* cache for key extracted informations */
+  /* cache for key extracted information */
   protected $format = '/^([-[:alnum:]=",]+\s+)?(disabled-)?(ssh-(dss|rsa)|ecdsa-sha2-nistp\d{3})\s+([[:alnum:]+\/.=]+)(\s+([[:graph:][:space:]]+))?\s*$/';
 
   function getArrayValue ()
@@ -106,7 +106,7 @@ class sshAccount extends simplePlugin
       'plIcon'          => 'geticon.php?context=applications&icon=ssh&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=ssh&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/subcontracting/locale/ar/fusiondirectory.po b/subcontracting/locale/ar/fusiondirectory.po
index 413886a9b42a6239c12bc0b0421134a2423bcd24..7afb5038b04cb5ac3fa1ef106eaa84b99dafc8cd 100644
--- a/subcontracting/locale/ar/fusiondirectory.po
+++ b/subcontracting/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,54 +17,54 @@ 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/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "الهاتف"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/ca/fusiondirectory.po b/subcontracting/locale/ca/fusiondirectory.po
index 99da391a956b92a3a83ac9763d26dd97afbb4aa4..a34af21b46e7f0aae1c6666402960433e1327c0f 100644
--- a/subcontracting/locale/ca/fusiondirectory.po
+++ b/subcontracting/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Telèfon"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/cs_CZ/fusiondirectory.po b/subcontracting/locale/cs_CZ/fusiondirectory.po
index c91cb2a29836c0302fced3653722f58f3e23735a..b57cfb358e46591cc9cc5c154fac677b6949bf36 100644
--- a/subcontracting/locale/cs_CZ/fusiondirectory.po
+++ b/subcontracting/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Telefon"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/de/fusiondirectory.po b/subcontracting/locale/de/fusiondirectory.po
index 3daa9fe6dce6cd826e6d509f0b4a57514a9eb5ff..26704a429a3dfcf1a7fff669c5cfe10793079014 100644
--- a/subcontracting/locale/de/fusiondirectory.po
+++ b/subcontracting/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Telefon"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/el_GR/fusiondirectory.po b/subcontracting/locale/el_GR/fusiondirectory.po
index c6a168aa36d2afef8783435c6376e0cd76c504f7..e0248d55a87982069dfcb6dee0a87bd0ed7e0827 100644
--- a/subcontracting/locale/el_GR/fusiondirectory.po
+++ b/subcontracting/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/en/fusiondirectory.po b/subcontracting/locale/en/fusiondirectory.po
index 6a32834148fcb2fdf3a529aefc8369b37c5c0321..5120832b58074721ef0b6d618e18c67f8ad8fea4 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/es/fusiondirectory.po b/subcontracting/locale/es/fusiondirectory.po
index ab53cc841da5e3e793343fbf66b0a93a56877cfe..0b911380b1ab3f958a443da75584cc9cdf155239 100644
--- a/subcontracting/locale/es/fusiondirectory.po
+++ b/subcontracting/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Teléfono"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/es_CO/fusiondirectory.po b/subcontracting/locale/es_CO/fusiondirectory.po
index 67ae5f74e507be3549f26418d35cd121e443f06e..e376e85f264ee36ace1ad0d473022f0e4e320321 100644
--- a/subcontracting/locale/es_CO/fusiondirectory.po
+++ b/subcontracting/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Teléfono"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/es_VE/fusiondirectory.po b/subcontracting/locale/es_VE/fusiondirectory.po
index f727a20951e9ab80c9792ddf61bbc6b843104e9d..775c8e6e330692331306eb1e4063ea03c06d6bbd 100644
--- a/subcontracting/locale/es_VE/fusiondirectory.po
+++ b/subcontracting/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Teléfono"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/fa_IR/fusiondirectory.po b/subcontracting/locale/fa_IR/fusiondirectory.po
index 10f233ea3c895fc1dc52c601c5200fd2310c8c5c..09f06ea48cd3c8c20936a98dfa5dee506684f855 100644
--- a/subcontracting/locale/fa_IR/fusiondirectory.po
+++ b/subcontracting/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "تلفن"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/fi_FI/fusiondirectory.po b/subcontracting/locale/fi_FI/fusiondirectory.po
index 9ff6607910e8a9a41624b1910c3c92f606352182..799c18f57c85c823201cf831959cf0ae963dc3ec 100644
--- a/subcontracting/locale/fi_FI/fusiondirectory.po
+++ b/subcontracting/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-02-25 10:29+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Puhelin"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/fr/fusiondirectory.po b/subcontracting/locale/fr/fusiondirectory.po
index b8979409f90673f6da0cea50c56a8582a3ed47a1..2a992bf17fc5b1211d316c2f237f2c1cf1b594b2 100644
--- a/subcontracting/locale/fr/fusiondirectory.po
+++ b/subcontracting/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:28+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,54 +18,54 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr "Sous traitance"
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr "Information pour la sous traitance"
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr "Information de sous traitance"
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr "Intermédiaire"
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr "Contact final chez le client"
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr "Client final"
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr "Contact final pour cette mission"
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr "Adresse de messagerie"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr "Adresse de courriel principale pour cette mission"
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Téléphone"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr "Numéro de téléphone pour cette mission"
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr "Adresse postale"
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr "Adresse ou la mission se déroule"
diff --git a/subcontracting/locale/hu_HU/fusiondirectory.po b/subcontracting/locale/hu_HU/fusiondirectory.po
index b89c8b80678f06b9da75d80a2a4a3b083870ce06..0dfe978f496b001a3c806989d8de96cc389469ad 100644
--- a/subcontracting/locale/hu_HU/fusiondirectory.po
+++ b/subcontracting/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/id/fusiondirectory.po b/subcontracting/locale/id/fusiondirectory.po
index 9de1d49be2bb34bf68317c1c2daab1ed36acb1e2..45447887ac3e76b2e28dbf15c5acee51ae86a4f4 100644
--- a/subcontracting/locale/id/fusiondirectory.po
+++ b/subcontracting/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/it_IT/fusiondirectory.po b/subcontracting/locale/it_IT/fusiondirectory.po
index 6e72bdb2f4319945991a56bd49fc277df7f96d19..a4c73beebd9f3dafefa096ccc4705cf9576ead4b 100644
--- a/subcontracting/locale/it_IT/fusiondirectory.po
+++ b/subcontracting/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 14:39+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,54 +19,54 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr "Subappalto"
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr "Informazioni necessarie per i contratti di subappalto"
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr "Informazioni subappalto"
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr "INtermedio"
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr "Rivolgersi al cliente finale"
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr "Cliente finale"
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr "Cliente finale per questa missione"
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr "Indirizzo di posta elettronica"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr "Indirizzo di posta elettronica assegnato per questa missione"
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Telefono"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr "NUmero di telefono assegnato per questa missione"
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr "Indirizzo dove si esegue questa missione"
diff --git a/subcontracting/locale/lv/fusiondirectory.po b/subcontracting/locale/lv/fusiondirectory.po
index 0e6326d302dcfefa07455d7d742c91086d76372e..65bd79d26a826cb989bfd4267707873cf06f459f 100644
--- a/subcontracting/locale/lv/fusiondirectory.po
+++ b/subcontracting/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Tālrunis"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/nb/fusiondirectory.po b/subcontracting/locale/nb/fusiondirectory.po
index f348e96b9fb88fcd1b20f742e10e5a3c8d22f8cc..998b102295a829ee6e1dcc58879a1b21414abd36 100644
--- a/subcontracting/locale/nb/fusiondirectory.po
+++ b/subcontracting/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/nl/fusiondirectory.po b/subcontracting/locale/nl/fusiondirectory.po
index b644da360387018f93ba5dd9908bdc182af3d0be..2d9a4e5f78c1cbf566606f3e499d1e3769feb212 100644
--- a/subcontracting/locale/nl/fusiondirectory.po
+++ b/subcontracting/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Telefoon"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/pl/fusiondirectory.po b/subcontracting/locale/pl/fusiondirectory.po
index f40e12c07676d254375d2a794f1a06626ff4b4cb..01a79ac66b9abe10b63ede040cdab69982ce4dff 100644
--- a/subcontracting/locale/pl/fusiondirectory.po
+++ b/subcontracting/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Telefon"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/pt/fusiondirectory.po b/subcontracting/locale/pt/fusiondirectory.po
index 16d962f5958a0ba25684d555ac07faafa86aa34d..b9dba8d1a68c52eadfaebf146ff50cd13faa0be2 100644
--- a/subcontracting/locale/pt/fusiondirectory.po
+++ b/subcontracting/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Fone"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/pt_BR/fusiondirectory.po b/subcontracting/locale/pt_BR/fusiondirectory.po
index 0710668963dae7f179299dff12aec0e258313ec6..b7242eb3508e2a60d2a12a007c25238676021360 100644
--- a/subcontracting/locale/pt_BR/fusiondirectory.po
+++ b/subcontracting/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Telefone"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/ru/fusiondirectory.po b/subcontracting/locale/ru/fusiondirectory.po
index 1820662379f8dd5710bcdba67c0eb965a582ddcb..308a50779371de4ff63e7cc8eba950a753a61d8f 100644
--- a/subcontracting/locale/ru/fusiondirectory.po
+++ b/subcontracting/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,54 +17,54 @@ 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/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Телефон"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/ru@petr1708/fusiondirectory.po b/subcontracting/locale/ru@petr1708/fusiondirectory.po
index 6f2d716d891489a9c88c6650cd071231ac52d2ac..bc5bd954de2061108f7d7d8cd15edd7c97776f65 100644
--- a/subcontracting/locale/ru@petr1708/fusiondirectory.po
+++ b/subcontracting/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,54 +17,54 @@ 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/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/sv/fusiondirectory.po b/subcontracting/locale/sv/fusiondirectory.po
index 00178569aa08b67a246481ef31c0ffca4539c888..96255d73cb11f9ad72253a7d901db8369ced627f 100644
--- a/subcontracting/locale/sv/fusiondirectory.po
+++ b/subcontracting/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Telefon"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/ug/fusiondirectory.po b/subcontracting/locale/ug/fusiondirectory.po
index 8c557cc0c8dcf5193922c61aa64123bbc785e98c..55133d68d6a2d7a9c602386be5eaebad606df012 100644
--- a/subcontracting/locale/ug/fusiondirectory.po
+++ b/subcontracting/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/vi_VN/fusiondirectory.po b/subcontracting/locale/vi_VN/fusiondirectory.po
index c80aa1f71b7f6fc25f563a9ff48b0e6ba003964c..5119b39769a5b0d35bddc9d5482476d5b83b0ab6 100644
--- a/subcontracting/locale/vi_VN/fusiondirectory.po
+++ b/subcontracting/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "Số điện thoại"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/zh/fusiondirectory.po b/subcontracting/locale/zh/fusiondirectory.po
index 565cbec04704e26413649f17bc5b9a89820329de..f11bc2e7230ca26c97b632bf8fbf4717570345c3 100644
--- a/subcontracting/locale/zh/fusiondirectory.po
+++ b/subcontracting/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:33
+#: personal/subcontracting/class_subContracting.inc:29
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:34
+#: personal/subcontracting/class_subContracting.inc:30
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:49
+#: personal/subcontracting/class_subContracting.inc:42
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:45
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:46
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:52
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:53
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:59
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:60
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:66
 msgid "Phone"
 msgstr "电话"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:67
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:80
+#: personal/subcontracting/class_subContracting.inc:73
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:81
+#: personal/subcontracting/class_subContracting.inc:74
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/personal/subcontracting/class_subContracting.inc b/subcontracting/personal/subcontracting/class_subContracting.inc
index 09fb94346643c8c52ae1aa7089d5c1ebea72ce7e..604baaecd233c84d7da490a1bc235925ab0c21a4 100644
--- a/subcontracting/personal/subcontracting/class_subContracting.inc
+++ b/subcontracting/personal/subcontracting/class_subContracting.inc
@@ -31,8 +31,7 @@ class subContractingAccount extends simplePlugin
       'plObjectType'  => array('user'),
       'plIcon'        => 'geticon.php?context=applications&icon=subcontracting&size=48',
       'plSmallIcon'   => 'geticon.php?context=applications&icon=subcontracting&size=16',
-
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sudo/admin/sudo/class_sudoGeneric.inc b/sudo/admin/sudo/class_sudoGeneric.inc
index d9ede30aa9464d92b4404501dd028c3c89aab90b..a99ec59880b1df5ffcd1ca1e5f02cbcba32f8514 100644
--- a/sudo/admin/sudo/class_sudoGeneric.inc
+++ b/sudo/admin/sudo/class_sudoGeneric.inc
@@ -132,7 +132,7 @@ class sudo extends simplePlugin
         'tabClass'  => 'sudotabs',
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sudo/admin/sudo/class_sudoManagement.inc b/sudo/admin/sudo/class_sudoManagement.inc
index 974adc4e5db51698a2c87e12cb8c82f6fee51cdc..aff2611901eaa8a130603dd76f0d04eb11a52d37 100644
--- a/sudo/admin/sudo/class_sudoManagement.inc
+++ b/sudo/admin/sudo/class_sudoManagement.inc
@@ -25,7 +25,7 @@ class sudoManagement extends simpleManagement
 
   protected $autoFilterAttributes = array('dn', 'cn', 'description', 'sudoUser', 'sudoHost');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
diff --git a/sudo/admin/sudo/class_sudoOption.inc b/sudo/admin/sudo/class_sudoOption.inc
index 516871ef4f79ad1d7089d343ca395897102b4984..d0bafc533d64612475538eee677005c5c86df051 100644
--- a/sudo/admin/sudo/class_sudoOption.inc
+++ b/sudo/admin/sudo/class_sudoOption.inc
@@ -253,7 +253,7 @@ class AvailableSudoOptionAttribute extends SelectAttribute
 
   function __construct ($label, $description, $ldapName, $required = TRUE, $acl = "")
   {
-    $choices = array_keys(self::$options);
+    $choices = array_keys(static::$options);
     sort($choices);
     parent::__construct ($label, $description, $ldapName, $required, $choices, "", NULL, $acl);
     $this->setInLdap(FALSE);
@@ -270,7 +270,7 @@ class AvailableSudoOptionAttribute extends SelectAttribute
     $id = $this->getLdapName();
     $choices = array_diff($this->choices, array_keys($this->plugin->attributesInfo['used_options']['attrs']['sudoOption']->attributes));
     $smarty->assign($id."_choices", $choices);
-    $options = self::$options;
+    $options = static::$options;
     $outputs = array_map(
       function ($choice) use ($options)
       {
@@ -290,7 +290,7 @@ class AvailableSudoOptionAttribute extends SelectAttribute
     if (isset($_POST["add".$this->getLdapName()])) {
       parent::loadPostValue();
       parent::applyPostValue();
-      $this->plugin->attributesInfo['used_options']['attrs']['sudoOption']->addOption($this->getValue(), self::$options[$this->getValue()]);
+      $this->plugin->attributesInfo['used_options']['attrs']['sudoOption']->addOption($this->getValue(), static::$options[$this->getValue()]);
     }
   }
 }
@@ -560,7 +560,7 @@ SCRIPT;
       'plObjectType'  => array('sudo'),
       'plPriority'    => 2,
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 }
diff --git a/sudo/config/sudo/class_sudoConfig.inc b/sudo/config/sudo/class_sudoConfig.inc
index 242d6788292a8180a56a504cc54544a8e2faa494..00dd3a022ef7489bd71dc0cbba8df3ecc0d980de 100644
--- a/sudo/config/sudo/class_sudoConfig.inc
+++ b/sudo/config/sudo/class_sudoConfig.inc
@@ -31,7 +31,7 @@ class sudoConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sudo/locale/ar/fusiondirectory.po b/sudo/locale/ar/fusiondirectory.po
index 256b7d9152725fd382e2c10170fa4f8466bbfa51..0e58aa217e73b0195cb8481efe4e52dfafc277b1 100644
--- a/sudo/locale/ar/fusiondirectory.po
+++ b/sudo/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "إختيار"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/ca/fusiondirectory.po b/sudo/locale/ca/fusiondirectory.po
index e141ff9aba5db2c302e11b44d71596f6b8b3a135..8a245ea2d5fe380a8033e37626d4855c7dd90618 100644
--- a/sudo/locale/ca/fusiondirectory.po
+++ b/sudo/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/cs_CZ/fusiondirectory.po b/sudo/locale/cs_CZ/fusiondirectory.po
index d335db995602e19c453d7c69eff01ef351202801..c9138b67f369720b5571bad23d1446e98e6d3c67 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -57,27 +57,27 @@ msgstr "Předvolba %s pro sudo není platná!"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Předvolby k dispozici"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Předvolba"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr "Přidat další předvolbu pro sudo"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr "Použité předvolby role sudo"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Předvolby"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Předvolby sudo"
 
diff --git a/sudo/locale/de/fusiondirectory.po b/sudo/locale/de/fusiondirectory.po
index cea24f99bca1707bfb434758e9ee9fad082c620c..0a01b00e3fdbd1d5003ae0aec8780785f54de65e 100644
--- a/sudo/locale/de/fusiondirectory.po
+++ b/sudo/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -57,27 +57,27 @@ msgstr "Die sudo-Option '%s' ist ungültig!"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Verfügbare Optionen"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Option"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr "Eine neue sudo-Option hinzufügen"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr "Benutzte sudo Rollenoptionen"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Optionen"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Sudo-Optionen"
 
diff --git a/sudo/locale/el_GR/fusiondirectory.po b/sudo/locale/el_GR/fusiondirectory.po
index 12989942b0147d530b10a8f243d0d579deb298cf..6f6cc1281c5a3633293955046d859aa230ad947d 100644
--- a/sudo/locale/el_GR/fusiondirectory.po
+++ b/sudo/locale/el_GR/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -59,27 +59,27 @@ msgstr "Η επιλογή sudo  '%s' είναι άκυρη!"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Διαθέσιμες επιλογές"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Επιλογή"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr "Προσθήκη νέας επιλογής sudo"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr "Χρησιμοποιημένες επιλογές ρόλου sudo"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Επιλογές"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Επιλογές Sudo"
 
diff --git a/sudo/locale/en/fusiondirectory.po b/sudo/locale/en/fusiondirectory.po
index b5ff21484f04b7c3a1a5a1bb9226c1edcc20c8ab..5e7008979b6bbc793c4431c1c04afa18d01b209a 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -31,39 +56,30 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:123
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
 #: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
@@ -138,19 +154,3 @@ msgstr ""
 #: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/es/fusiondirectory.po b/sudo/locale/es/fusiondirectory.po
index 81eb17f0fdc461a8b59a36887eceefb5285f18fc..0f34d739e5d7a93dd2ae11ff2485ad1df3f0ca3f 100644
--- a/sudo/locale/es/fusiondirectory.po
+++ b/sudo/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -56,27 +56,27 @@ msgstr "¡La opción Sudo %s no es válida!"
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Opciones disponibles"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Opción"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Opciones Sudo"
 
diff --git a/sudo/locale/es_CO/fusiondirectory.po b/sudo/locale/es_CO/fusiondirectory.po
index 2ab2b2cf88ea39b76ee3168f7574617aff9c88a2..a7f1b25c825d0c2f3a1b4289a9b5573deb6d900f 100644
--- a/sudo/locale/es_CO/fusiondirectory.po
+++ b/sudo/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/es_VE/fusiondirectory.po b/sudo/locale/es_VE/fusiondirectory.po
index 74b731992f52c1e3bd375aab8b628b8311f7e3dd..1ed68092c6bb24e86d0413cddaca72a6d63c6dc6 100644
--- a/sudo/locale/es_VE/fusiondirectory.po
+++ b/sudo/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -56,27 +56,27 @@ msgstr "¡La opción Sudo %s no es válida!"
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Opciones disponibles"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Opción"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Opciones Sudo"
 
diff --git a/sudo/locale/fa_IR/fusiondirectory.po b/sudo/locale/fa_IR/fusiondirectory.po
index 6208792d9e1c5dce76b220ff32175560fb0c15f5..d6aa7e7acf4333365e16fb77521083aa042dc595 100644
--- a/sudo/locale/fa_IR/fusiondirectory.po
+++ b/sudo/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/fi_FI/fusiondirectory.po b/sudo/locale/fi_FI/fusiondirectory.po
index 4c090849f92e8d316d760551ad5198dc67995bf2..9072f7fe0bb86d35e6a64c13341136bede1c8ec5 100644
--- a/sudo/locale/fi_FI/fusiondirectory.po
+++ b/sudo/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/fr/fusiondirectory.po b/sudo/locale/fr/fusiondirectory.po
index ae012a6f5a8823ae65abce6e8eebfe9a69d01946..05a4e1aea86fb5a00beaef7e7e8d1c03089d8dca 100644
--- a/sudo/locale/fr/fusiondirectory.po
+++ b/sudo/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -58,27 +58,27 @@ msgstr "L'option sudo '%s' est invalide !"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Options disponibles"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Option"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr "Ajouter une nouvelle option sudo "
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr "Options sudo utilisées"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Options"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Options Sudo"
 
diff --git a/sudo/locale/hu_HU/fusiondirectory.po b/sudo/locale/hu_HU/fusiondirectory.po
index 9886c46ff294c0b5c99787f32e1740696d231906..2975a2ab8591cffaa597f884c2c1c791429213b3 100644
--- a/sudo/locale/hu_HU/fusiondirectory.po
+++ b/sudo/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/id/fusiondirectory.po b/sudo/locale/id/fusiondirectory.po
index bb34787bc321ea563d8a2e441842544d2d85941b..e7554ca95d611ee1e6feee2c28e65f82f04e14ac 100644
--- a/sudo/locale/id/fusiondirectory.po
+++ b/sudo/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/it_IT/fusiondirectory.po b/sudo/locale/it_IT/fusiondirectory.po
index 9655a74c7c9b08f8160080ceca8eb2622b1971d2..fb7817689012966639ce909bbd1dbe4772c0254a 100644
--- a/sudo/locale/it_IT/fusiondirectory.po
+++ b/sudo/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -58,27 +58,27 @@ msgstr "L'opzione di sudo '%s' non è valida !"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Opzioni disponibili"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Opzione"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr "Aggiungi una nuova opzione sudo"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr "Opzioni utilizzate del ruolo sudo"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Opzioni"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Opzioni di Sudo"
 
diff --git a/sudo/locale/lv/fusiondirectory.po b/sudo/locale/lv/fusiondirectory.po
index fd5e34bb795fa1ca6db0fb2f9a86c08e74cf3f6a..1b791af321d23e462a66f3d68ec8a32e0ee48d69 100644
--- a/sudo/locale/lv/fusiondirectory.po
+++ b/sudo/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/nb/fusiondirectory.po b/sudo/locale/nb/fusiondirectory.po
index b0b793c16d0472f4cdb730de7b236c8f6c4efe1a..2066acfe63030d9eaafbef50f87a2ef5fc2971f8 100644
--- a/sudo/locale/nb/fusiondirectory.po
+++ b/sudo/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/nl/fusiondirectory.po b/sudo/locale/nl/fusiondirectory.po
index e284ecbf373d2d9ef4d71be0d072c4c08d27b73d..b5c6d338cabc3ed55a4dda7743afea8825a2013f 100644
--- a/sudo/locale/nl/fusiondirectory.po
+++ b/sudo/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -56,27 +56,27 @@ msgstr "Deze sudo optie '%s' is ongeldig!"
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Beschikbare opties"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Optie"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Opties"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Sudo opties"
 
diff --git a/sudo/locale/pl/fusiondirectory.po b/sudo/locale/pl/fusiondirectory.po
index 0fc3b99df8efc538256de9bfc9fd280c43e6b6af..24463ed6a66a2faead2cbd2584e41e2fdda21311 100644
--- a/sudo/locale/pl/fusiondirectory.po
+++ b/sudo/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Opcja"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Opcje"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/pt/fusiondirectory.po b/sudo/locale/pt/fusiondirectory.po
index 2cfd23d5a0d31dac51abc18229b4058e88a51343..6ccafe06c40cc70f076a979cfa8102296bfb46de 100644
--- a/sudo/locale/pt/fusiondirectory.po
+++ b/sudo/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/pt_BR/fusiondirectory.po b/sudo/locale/pt_BR/fusiondirectory.po
index ad3597e29e10f51eeb599b92b346c439e0ccbe7b..c6ede38faa78528c0173120451b26cb922585c7c 100644
--- a/sudo/locale/pt_BR/fusiondirectory.po
+++ b/sudo/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -56,27 +56,27 @@ msgstr "A opção SUDO '%s' é inválida"
 msgid "%s (%s)"
 msgstr "%s(%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr "Opções disponíveis"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Opção"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr "Adicionar nova opção de sudo"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr "Opções de funções sudo utilizados"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Opções"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr "Opções de sudo"
 
diff --git a/sudo/locale/ru/fusiondirectory.po b/sudo/locale/ru/fusiondirectory.po
index b8b6a7816918e7be63ae5fa74a6a74050774650e..b3efa5d5375b44101cb5a87422f84f42e8f50157 100644
--- a/sudo/locale/ru/fusiondirectory.po
+++ b/sudo/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "Опции"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Параметры"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/ru@petr1708/fusiondirectory.po b/sudo/locale/ru@petr1708/fusiondirectory.po
index 3ae8bd737ab0b621da8b53aa92d9ab1b6421502c..14c59905a32e6f4a46206a4f736e292b56069ff9 100644
--- a/sudo/locale/ru@petr1708/fusiondirectory.po
+++ b/sudo/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/sv/fusiondirectory.po b/sudo/locale/sv/fusiondirectory.po
index 33fbb5f289ef5537418719f45d485cdc838a47b9..923dc9d8e13aff7b1db43fa884e7b64c276a55d1 100644
--- a/sudo/locale/sv/fusiondirectory.po
+++ b/sudo/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "Alternativ"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/ug/fusiondirectory.po b/sudo/locale/ug/fusiondirectory.po
index 6fc6d7099758f03b0cad88cf59e9ee8d80309578..b0a007b186e1225f53afc2963a96f6a2338e4a8c 100644
--- a/sudo/locale/ug/fusiondirectory.po
+++ b/sudo/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/vi_VN/fusiondirectory.po b/sudo/locale/vi_VN/fusiondirectory.po
index 5ad0d3c16bdff854ccfe023d43abfd67cc3d80b2..88add7a9144f5c1f7ef9c935b0d055a91ad15429 100644
--- a/sudo/locale/vi_VN/fusiondirectory.po
+++ b/sudo/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/sudo/locale/zh/fusiondirectory.po b/sudo/locale/zh/fusiondirectory.po
index 6f2322ed53c31d3edcee649dd92d1cd6e9f7b534..4314e08ed4d695248feff4ff4487516f6eca63e8 100644
--- a/sudo/locale/zh/fusiondirectory.po
+++ b/sudo/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -56,27 +56,27 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:480
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Option"
 msgstr "选项"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:483
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:557
 msgid "Options"
 msgstr "选项"
 
-#: admin/sudo/class_sudoOption.inc:559
+#: admin/sudo/class_sudoOption.inc:558
 msgid "Sudo options"
 msgstr ""
 
diff --git a/supann/admin/supannStructures/class_entite.inc b/supann/admin/supannStructures/class_entite.inc
index e8b01437bf71aedc1d0a4e67a271cae5aa013199..7f477105a0421f406a53b24e98f76c33f0cc40b2 100644
--- a/supann/admin/supannStructures/class_entite.inc
+++ b/supann/admin/supannStructures/class_entite.inc
@@ -24,7 +24,7 @@ class entite extends simplePlugin
 
   var $mainTab = TRUE;
 
-  /* Return plugin informations */
+  /* Return plugin information */
   static function plInfo()
   {
     return array(
@@ -40,7 +40,7 @@ class entite extends simplePlugin
         'nameAttr'    => 'ou',
       )),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -58,7 +58,7 @@ class entite extends simplePlugin
         )
       ),
       'admin' => array(
-        'name'  => _('Administrative informations'),
+        'name'  => _('Administrative information'),
         'attrs' => array(
           new StringAttribute(
             _('Telephone'), _('Phone number for this entity'),
@@ -79,7 +79,7 @@ class entite extends simplePlugin
         )
       ),
       'supann' => array(
-        'name'  => _('SUPANN informations'),
+        'name'  => _('SUPANN information'),
         'attrs' => array(
           new SelectAttribute(
             _('Entity type'), _('The best SUPANN type that fits this entity'),
diff --git a/supann/admin/supannStructures/class_etablissement.inc b/supann/admin/supannStructures/class_etablissement.inc
index f32eaca27fe7e7f8c2fa76c4a89b7be711b1c6fa..9568e937a27cb379cbe0e12b26d8343ac0bdf5fd 100644
--- a/supann/admin/supannStructures/class_etablissement.inc
+++ b/supann/admin/supannStructures/class_etablissement.inc
@@ -15,7 +15,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class etablissement extends simplePlugin
@@ -24,7 +24,7 @@ class etablissement extends simplePlugin
 
   var $mainTab = TRUE;
 
-  /* Return plugin informations */
+  /* Return plugin information */
   static function plInfo()
   {
     return array(
@@ -40,7 +40,7 @@ class etablissement extends simplePlugin
         'nameAttr'    => 'o',
       )),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/supann/admin/supannStructures/class_supann.inc b/supann/admin/supannStructures/class_supann.inc
index 04b651e5a9f66d326545b828130ebc7d7968d1dd..d190f73d6eb424c1aee8a7bd208ad33324773c56 100644
--- a/supann/admin/supannStructures/class_supann.inc
+++ b/supann/admin/supannStructures/class_supann.inc
@@ -31,7 +31,7 @@ class supann
     while ($file = readdir($dir)) {
       if (preg_match('/^'.$shortname.'_(.+)$/', $file, $m)) {
         $prefix = $m[1];
-        $res[$prefix] =& self::get_choices_for($file);
+        $res[$prefix] =& static::get_choices_for($file);
       }
     }
     closedir($dir);
@@ -41,8 +41,8 @@ class supann
 
   static function &get_choices_for($type, $prefix = '')
   {
-    if (isset(self::$choices_for[$prefix.$type])) {
-      return self::$choices_for[$prefix.$type];
+    if (isset(static::$choices_for[$prefix.$type])) {
+      return static::$choices_for[$prefix.$type];
     }
     $entity_codes   = array();
     $entity_labels  = array();
@@ -61,14 +61,14 @@ class supann
           $entite_line = preg_split('/;/', trim($line));
 
           $entity_codes[]   = $prefix.$entite_line[0];
-          $entity_labels[]  = self::truncate_label($entite_line[1]);
+          $entity_labels[]  = static::truncate_label($entite_line[1]);
         }
       }
       fclose($entiteList);
     }
     array_multisort($entity_labels, $entity_codes);
-    self::$choices_for[$prefix.$type] = array($entity_codes, $entity_labels);
-    return self::$choices_for[$prefix.$type];
+    static::$choices_for[$prefix.$type] = array($entity_codes, $entity_labels);
+    return static::$choices_for[$prefix.$type];
   }
 
   /* return the 64 first chars and "…" after if text is longer */
diff --git a/supann/admin/supannStructures/class_supannStructuresManagement.inc b/supann/admin/supannStructures/class_supannStructuresManagement.inc
index c2f34ba35c74313997e12987d774ceb77e55d8bf..37356a76e19fb14e7f192b449e7fa129cf56a4ca 100644
--- a/supann/admin/supannStructures/class_supannStructuresManagement.inc
+++ b/supann/admin/supannStructures/class_supannStructuresManagement.inc
@@ -28,7 +28,7 @@ class supannStructuresManagement extends simpleManagement
   protected $departmentRootVisible  = FALSE;
   protected $baseMode               = FALSE;
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
diff --git a/supann/config/supann/class_supannConfig.inc b/supann/config/supann/class_supannConfig.inc
index 65c0daa5405164de6f9e34111ec718863edf2402..9ef6b5318fdef305972071f22b9e229fc5a21487 100644
--- a/supann/config/supann/class_supannConfig.inc
+++ b/supann/config/supann/class_supannConfig.inc
@@ -30,7 +30,7 @@ class supannConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/supann/locale/ar/fusiondirectory.po b/supann/locale/ar/fusiondirectory.po
index 230fcc9cdb9ff718abc710851c64924c7d933024..97b923937bb8334b8b34f23e81bf9ae15149601b 100644
--- a/supann/locale/ar/fusiondirectory.po
+++ b/supann/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/ca/fusiondirectory.po b/supann/locale/ca/fusiondirectory.po
index 996f31c80381e9b2f297de061b42a08ed33609d0..fce19af84d65ff2ef5f1768bd9192c47ec4b1d81 100644
--- a/supann/locale/ca/fusiondirectory.po
+++ b/supann/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/cs_CZ/fusiondirectory.po b/supann/locale/cs_CZ/fusiondirectory.po
index 060d3e9434178771b3902bfde312d68dcf204f96..dff1ec87f7f815cfc605142ef0a610b1fb7555f5 100644
--- a/supann/locale/cs_CZ/fusiondirectory.po
+++ b/supann/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr "SupAnn"
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
-msgstr "Zásuvný modul pro správu SupAnn informací"
+msgid "SupAnn information management plugin"
+msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr "Identita"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr "Zdvořilostní"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr "supannCivilite – oslovení této osoby"
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr "Alternativní přihlašovací jméno"
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr "supannAliasLogin – alternativní název pro přihlašovací jméno tohoto uživatele"
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr "eduPersonPrincipalName – název ve formě <identifikátor>@<doména>, který je jedinečný pro tuto doménu a nebyl v současnosti přidělen nikomu dalšímu"
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr "Přezdívka"
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr "eduPersonNickname – může obsahovat přezdívku tohoto uživatele"
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr "Identifikátory reference"
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr "supannRefId – Identifikátory/odkazy tohoto uživatele na ostatních systémech"
 
@@ -588,8 +588,8 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr "Název, který této entitě zapsat do atributu Organizační jednotka"
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Správní údaje"
+msgid "Administrative information"
+msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
 msgid "Phone number for this entity"
@@ -612,8 +612,8 @@ msgid "Short description of this entity"
 msgstr "Stručný popis této entity"
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "Informace o SUPANN"
+msgid "SUPANN information"
+msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
 msgid "Entity type"
diff --git a/supann/locale/de/fusiondirectory.po b/supann/locale/de/fusiondirectory.po
index da83629af30e687386dcce8795f3c73b77dbeaa4..31ad57c6f17afb83749bfaac39e6051a257a1ff1 100644
--- a/supann/locale/de/fusiondirectory.po
+++ b/supann/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr "SupAnn"
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr "Identität"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr "Aliasanmeldung"
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr "Kurzname"
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,8 +588,8 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Administrative Informationen"
+msgid "Administrative information"
+msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
 msgid "Phone number for this entity"
@@ -612,8 +612,8 @@ msgid "Short description of this entity"
 msgstr "Kurze Beschreibung von dieser Einheit"
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "SUPANN-Informationen"
+msgid "SUPANN information"
+msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
 msgid "Entity type"
diff --git a/supann/locale/el_GR/fusiondirectory.po b/supann/locale/el_GR/fusiondirectory.po
index 7e845f9cc80f4c23832267cb6aad12f998227856..cc360863575137556db1cfdb7048c626a4b39db5 100644
--- a/supann/locale/el_GR/fusiondirectory.po
+++ b/supann/locale/el_GR/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -85,52 +85,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr "Ιθαγένεια"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr "eduPersonPrincipalName"
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr "Ψευδώνυμο"
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -590,8 +590,8 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr "Το όνομα που θα εγγράφεται στο γνώρισμα ou για αυτή την οντότητα"
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Διαχειριστικές πληροφορίες"
+msgid "Administrative information"
+msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
 msgid "Phone number for this entity"
@@ -614,8 +614,8 @@ msgid "Short description of this entity"
 msgstr "Σύντομη περιγραφή για αυτή την οντότητα"
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "Πληροφορίες SUPANN"
+msgid "SUPANN information"
+msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
 msgid "Entity type"
diff --git a/supann/locale/en/fusiondirectory.po b/supann/locale/en/fusiondirectory.po
index 9bf4e9871f2380fea7953247726a27e2ce259784..f91b6756f03ed220de0301467439dcd9e273776d 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -314,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique "
 "for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -645,3 +420,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative information"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:64
+msgid "Phone number for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax number for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:76
+msgid "Short description of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:82
+msgid "SUPANN information"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/es/fusiondirectory.po b/supann/locale/es/fusiondirectory.po
index 98df399c38a18590300e7915c94b0334d2179d51..42ddd13fb4e8539ae0d3a987d3caa4d6cd61b725 100644
--- a/supann/locale/es/fusiondirectory.po
+++ b/supann/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 17:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr "SUPANN"
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/es_CO/fusiondirectory.po b/supann/locale/es_CO/fusiondirectory.po
index 36d8eb305281b1ca694b83850ae364db410a60de..29324c6f0dd8ba45ea10a828a3c7a660785d3a35 100644
--- a/supann/locale/es_CO/fusiondirectory.po
+++ b/supann/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/es_VE/fusiondirectory.po b/supann/locale/es_VE/fusiondirectory.po
index 31fdeb33680c2daea7a8f1e2de06d37ce44349e4..af8c77d829df9bb977ba8c248a5c7afd3830b3fe 100644
--- a/supann/locale/es_VE/fusiondirectory.po
+++ b/supann/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr "SUPANN"
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/fa_IR/fusiondirectory.po b/supann/locale/fa_IR/fusiondirectory.po
index 44d620067815ca9d54f106c7388d18b407be151c..3a8c65f74c6a8a9ea3ed27dca48712a3f3ae6f56 100644
--- a/supann/locale/fa_IR/fusiondirectory.po
+++ b/supann/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/fi_FI/fusiondirectory.po b/supann/locale/fi_FI/fusiondirectory.po
index c287a9051ab121985cde2e732d2faf739bbe3c29..e59b37f1112a2746919f3a25422bcf3a2eb704a1 100644
--- a/supann/locale/fi_FI/fusiondirectory.po
+++ b/supann/locale/fi_FI/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:03+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/fr/fusiondirectory.po b/supann/locale/fr/fusiondirectory.po
index c03ed7e8d551ca93e6c4db62c8f86d5fc882896b..7768b5f968d4760afe7a46e9a246b48eae12e559 100644
--- a/supann/locale/fr/fusiondirectory.po
+++ b/supann/locale/fr/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
+# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
 # MCMic, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:09+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,52 +85,52 @@ msgid "SupAnn"
 msgstr "SupAnn"
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr "Plugin de gestion des informations SUPANN"
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr "Identité"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr "Civilité"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr "Civilité pour cette personne"
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr "Alias de l'identifiant"
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr "supannAliasLogin - Alias de l'identifiant de connexion"
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr "Nom principal eduPerson"
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr "eduPersonPrincipalName - identifiant similaire à <id>@<domaine> qui est unique pour le domaine  et qui n'a jamais été attribué récemment "
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr "Surnom"
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr "eduPersonNickName - peut contenir un surnom pour cet utilisateur"
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr "Ids de références"
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr "supannRefId - ID / liens pour cet utilisateur sur d'autres systèmes"
 
@@ -590,7 +590,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr "Nom à écrire dans l'attribut 'ou' pour cette entité"
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr "Informations administratives"
 
 #: admin/supannStructures/class_entite.inc:64
@@ -614,7 +614,7 @@ msgid "Short description of this entity"
 msgstr "Courte description de cette entité"
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr "Informations SUPANN"
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/hu_HU/fusiondirectory.po b/supann/locale/hu_HU/fusiondirectory.po
index 2b1ec6170f061b5bd4622d453dd1c495e4db395b..df47bbd413c32b7e5280938d4e64185c9553f983 100644
--- a/supann/locale/hu_HU/fusiondirectory.po
+++ b/supann/locale/hu_HU/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:03+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/id/fusiondirectory.po b/supann/locale/id/fusiondirectory.po
index 44429e2626e89483f6a0189284a8acd30d6b7894..8ab5200a6c16dc989ac77223f3c1072af0388264 100644
--- a/supann/locale/id/fusiondirectory.po
+++ b/supann/locale/id/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:03+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/it_IT/fusiondirectory.po b/supann/locale/it_IT/fusiondirectory.po
index d3de1b98039b4aff04b99ec2cf0187eac93939af..47d0bc0a05f114eca6af730ab831094041af07a6 100644
--- a/supann/locale/it_IT/fusiondirectory.po
+++ b/supann/locale/it_IT/fusiondirectory.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
+# Paola Penati <penati@avaya.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 15:29+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:23+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -84,52 +85,52 @@ msgid "SupAnn"
 msgstr "SUPANN"
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr "Plugin di gestione delle informazioni SUPANN "
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr "Identità"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr "Civiltà"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr "supannCivilite - Civiltà per questa persona"
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr "Login Alias"
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr "supannAliasLogin - Un alias per il login di questo utente"
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr "eduPersonPrincipalName"
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr "eduPersonPrincipalName - Nome di tipo <id>@<domain>  che sia unico per questo domain e che non sia stato assegnato a nessun altro di recente"
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr "Nickname"
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr "eduPersonNickname - Puo contenere un diminutivo per questo utente"
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr "Ref ids"
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr "supannRefId - Links ID per questo utente su altri sistemi"
 
@@ -589,7 +590,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr "Nome da scrivere nell'attributo di questa entità"
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr "Informazioni amministrative"
 
 #: admin/supannStructures/class_entite.inc:64
@@ -613,7 +614,7 @@ msgid "Short description of this entity"
 msgstr "Breve descrizione di questa entità"
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr "Informazioni SUPANN"
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/lv/fusiondirectory.po b/supann/locale/lv/fusiondirectory.po
index 3206c61dcb185250c2b676dfe6f78df0eeff180b..813818ae804ae1593e50576c12a3a7f8795a0b6f 100644
--- a/supann/locale/lv/fusiondirectory.po
+++ b/supann/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/nb/fusiondirectory.po b/supann/locale/nb/fusiondirectory.po
index 9ffbe92c53e9fd02aa0005f1978994c07b4fbc37..aa06dae4e4b2eb0446f8f618f674300de3811cc6 100644
--- a/supann/locale/nb/fusiondirectory.po
+++ b/supann/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/nl/fusiondirectory.po b/supann/locale/nl/fusiondirectory.po
index 815774513ef4a3ea4b3d9810de711a064ed2fc71..03e1df759b2bb16298f1a6cdc52f88865fa268da 100644
--- a/supann/locale/nl/fusiondirectory.po
+++ b/supann/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr "SUPANN"
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr "Identieit"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr "eduPersoonNaam"
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/pl/fusiondirectory.po b/supann/locale/pl/fusiondirectory.po
index 84bb6e9b33d7ecebc120a48b2ca41a45b543e3f4..e6e4c0d1ced1fd233beafa90bef9e8a2017f14e2 100644
--- a/supann/locale/pl/fusiondirectory.po
+++ b/supann/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/pt/fusiondirectory.po b/supann/locale/pt/fusiondirectory.po
index 164b3f66ea6835da7633c8be6fce20b3c2abf9a1..2e3d98d136f0887f514c96265ea63239860114c4 100644
--- a/supann/locale/pt/fusiondirectory.po
+++ b/supann/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/pt_BR/fusiondirectory.po b/supann/locale/pt_BR/fusiondirectory.po
index 0321a56aa4e0818b5d4aa99ec262e740fe534e5e..bd9d09d74837fb7f414bef4c5c5e0e60e092de5b 100644
--- a/supann/locale/pt_BR/fusiondirectory.po
+++ b/supann/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr "Identidade"
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr "Login de alias"
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr "Apelido"
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,8 +588,8 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Informações administrativas"
+msgid "Administrative information"
+msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
 msgid "Phone number for this entity"
@@ -612,8 +612,8 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "Informações de SUPANN"
+msgid "SUPANN information"
+msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
 msgid "Entity type"
diff --git a/supann/locale/ru/fusiondirectory.po b/supann/locale/ru/fusiondirectory.po
index ed7690c02f0ad2ec812187da6a953ea43d54727d..b285f44c7ce28c82588ba9f5beb2dfc31e435430 100644
--- a/supann/locale/ru/fusiondirectory.po
+++ b/supann/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-08 09:58+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/ru@petr1708/fusiondirectory.po b/supann/locale/ru@petr1708/fusiondirectory.po
index da33ba3f4e0be75666139a012ccfd4a5b790d1a6..afc9da5dadd8a3aeede08ae7d88bfc96bf7225df 100644
--- a/supann/locale/ru@petr1708/fusiondirectory.po
+++ b/supann/locale/ru@petr1708/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:03+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/sv/fusiondirectory.po b/supann/locale/sv/fusiondirectory.po
index d6f88147a31615f8ec9105fccab9f59866158944..5d5cfc824ea54fe5fde5e15f9ef99e8cf0693b4a 100644
--- a/supann/locale/sv/fusiondirectory.po
+++ b/supann/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/ug/fusiondirectory.po b/supann/locale/ug/fusiondirectory.po
index 93e88183107368b22fe22f2f6ab3a649ab94f83f..cea2525faf497db6b8acc315f50e8f40ca8e32cb 100644
--- a/supann/locale/ug/fusiondirectory.po
+++ b/supann/locale/ug/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:03+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/vi_VN/fusiondirectory.po b/supann/locale/vi_VN/fusiondirectory.po
index 605bf91aadf9a8d2e06d1da02510d81eb7a22194..3f40cb220a4467ecdb5cc546264ca27f84b3a8bb 100644
--- a/supann/locale/vi_VN/fusiondirectory.po
+++ b/supann/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/locale/zh/fusiondirectory.po b/supann/locale/zh/fusiondirectory.po
index 7b3c4a386129e9c0a9b1fa1eefade79a45bcd977..685545d3496d8b66705bd948c299236fb30fdf34 100644
--- a/supann/locale/zh/fusiondirectory.po
+++ b/supann/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -83,52 +83,52 @@ msgid "SupAnn"
 msgstr ""
 
 #: personal/supann/class_supannAccount.inc:217
-msgid "SupAnn informations management plugin"
+msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:234
+#: personal/supann/class_supannAccount.inc:233
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:237
+#: personal/supann/class_supannAccount.inc:236
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:242
+#: personal/supann/class_supannAccount.inc:241
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:246
+#: personal/supann/class_supannAccount.inc:245
 msgid ""
 "eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
 " for this domain, and has not be assigned to anyone else recently"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:250
+#: personal/supann/class_supannAccount.inc:249
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:255
+#: personal/supann/class_supannAccount.inc:254
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "The name to write in the ou attribute for this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
+msgid "Administrative information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
@@ -612,7 +612,7 @@ msgid "Short description of this entity"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
+msgid "SUPANN information"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
diff --git a/supann/personal/supann/class_supannAccount.inc b/supann/personal/supann/class_supannAccount.inc
index 846757fc3932caf8f7d09a47dbd248a212aa4bd8..f9c5cf17b4131fb29fa5ec0c7d2813495fa56e4b 100644
--- a/supann/personal/supann/class_supannAccount.inc
+++ b/supann/personal/supann/class_supannAccount.inc
@@ -214,14 +214,14 @@ class supannAccount extends simplePlugin
   {
     return array(
       'plShortName'   => _('SupAnn'),
-      'plDescription' => _('SupAnn informations management plugin'),
+      'plDescription' => _('SupAnn information management plugin'),
       'plIcon'        => 'geticon.php?context=applications&icon=supann&size=48',
       'plSmallIcon'   => 'geticon.php?context=applications&icon=supann&size=16',
       'plSelfModify'  => TRUE,
       'plPriority'    => 14,
       'plObjectType'  => array('user'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sympa/admin/sympa/class_sympaAlias.inc b/sympa/admin/sympa/class_sympaAlias.inc
index 3a73e004e33da3db12f2fbd201148c3c26160915..9984c0ef869c38c4af07ebb835fec3d6059301c1 100644
--- a/sympa/admin/sympa/class_sympaAlias.inc
+++ b/sympa/admin/sympa/class_sympaAlias.inc
@@ -22,7 +22,7 @@ class sympaAlias extends simplePlugin
 {
   var $objectclasses = array('sympaAlias');
 
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling */
   public static function plInfo()
   {
     return array(
@@ -37,7 +37,7 @@ class sympaAlias extends simplePlugin
         'ou'          => get_ou('aliasRDN'),
       )),
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sympa/admin/systems/services/sympa/class_serviceSympa.inc b/sympa/admin/systems/services/sympa/class_serviceSympa.inc
index ae015a400fc8127c1bf9d0c8542f24db547a6724..306d80cbbc7ddb42e5fc114bdb436758e4d9b784 100644
--- a/sympa/admin/systems/services/sympa/class_serviceSympa.inc
+++ b/sympa/admin/systems/services/sympa/class_serviceSympa.inc
@@ -24,7 +24,7 @@ class serviceSympa extends simpleService
   /* This plugin only writes its objectClass */
   var $objectclasses  = array("sympaServer");
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -32,7 +32,7 @@ class serviceSympa extends simpleService
       'plDescription' => _('Sympa Server').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=applications&icon=sympa&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/sympa/locale/ar/fusiondirectory.po b/sympa/locale/ar/fusiondirectory.po
index 24a2d18785030a2be0ea25cb4a6a40ce5d45ad76..3a18c69e1d56e301c43ca5de8d76cc49541aa3ce 100644
--- a/sympa/locale/ar/fusiondirectory.po
+++ b/sympa/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/sympa/locale/ca/fusiondirectory.po b/sympa/locale/ca/fusiondirectory.po
index 184cebc04582185c99d3b48fa9490c00289d0239..820eaafc4ba4baa15e6653842380dd4a0f2840f0 100644
--- a/sympa/locale/ca/fusiondirectory.po
+++ b/sympa/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/sympa/locale/cs_CZ/fusiondirectory.po b/sympa/locale/cs_CZ/fusiondirectory.po
index e6447a6929b83fef19e15391f395361db2cec05a..a52975b0a57247295c86847383978840ae570685 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/sympa/locale/de/fusiondirectory.po b/sympa/locale/de/fusiondirectory.po
index a323336ad3508c73e8d1484f4d35152ea355f1e0..77dd0f43c2916e4d07138ff029fb4fd6cc572b90 100644
--- a/sympa/locale/de/fusiondirectory.po
+++ b/sympa/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/sympa/locale/el_GR/fusiondirectory.po b/sympa/locale/el_GR/fusiondirectory.po
index 6d6a3e9861fab8d5f93bb91a3336820dfac95721..66a7fd4c6437faaaf9221958941d7ca813a89691 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/sympa/locale/en/fusiondirectory.po b/sympa/locale/en/fusiondirectory.po
index d12be6d54f6f59df2e4fe7adb9ecd65bc860fa4a..b1dafe4a8bd592cabf6d6d639d7104d9883dc27c 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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/sympa/locale/es/fusiondirectory.po b/sympa/locale/es/fusiondirectory.po
index 6e196f737c9e25f46d6477cf041519268c356dff..df7b2900930b5b6a3c1d6a8f20321958499d6470 100644
--- a/sympa/locale/es/fusiondirectory.po
+++ b/sympa/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/sympa/locale/es_CO/fusiondirectory.po b/sympa/locale/es_CO/fusiondirectory.po
index 9fd652b6b70e35ffc3fbc33364d1e413a8e37fca..ec2a8b5a5e9f940eb01eea007d34adc83de16255 100644
--- a/sympa/locale/es_CO/fusiondirectory.po
+++ b/sympa/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/sympa/locale/es_VE/fusiondirectory.po b/sympa/locale/es_VE/fusiondirectory.po
index 8c159400e757b409717e2045741012b930c9f4a0..9e8901ce99765832a7e4f256bb372df7aa8df76d 100644
--- a/sympa/locale/es_VE/fusiondirectory.po
+++ b/sympa/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/sympa/locale/fa_IR/fusiondirectory.po b/sympa/locale/fa_IR/fusiondirectory.po
index 8bd86c5bb7437f501867e70c47a2597ed6e45309..fbd7b407ff9a34c486a192b908ce8fda0beb7c57 100644
--- a/sympa/locale/fa_IR/fusiondirectory.po
+++ b/sympa/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/sympa/locale/fi_FI/fusiondirectory.po b/sympa/locale/fi_FI/fusiondirectory.po
index 9d2769fa1d94ddd4cbab469f82df207f0ede45d2..da93eaee8c59e844eab22ddb301631e947c89a87 100644
--- a/sympa/locale/fi_FI/fusiondirectory.po
+++ b/sympa/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/sympa/locale/fr/fusiondirectory.po b/sympa/locale/fr/fusiondirectory.po
index 04161aad62ea94b915d291e3a53b16af56b0027f..83228d0bfa75dd9eae51760a3c12f878ddb29866 100644
--- a/sympa/locale/fr/fusiondirectory.po
+++ b/sympa/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/sympa/locale/hu_HU/fusiondirectory.po b/sympa/locale/hu_HU/fusiondirectory.po
index 517ce100e12ed77b350e5b6e2386561eb23e8306..3c37f03b714a9aaf72f2437f415b251c271cf569 100644
--- a/sympa/locale/hu_HU/fusiondirectory.po
+++ b/sympa/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/sympa/locale/id/fusiondirectory.po b/sympa/locale/id/fusiondirectory.po
index 1bd009fab1e0ce88f00563349c24927b6a95eea1..ef79b699f33cfc34ef15f064d3e607c2beda4976 100644
--- a/sympa/locale/id/fusiondirectory.po
+++ b/sympa/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/sympa/locale/it_IT/fusiondirectory.po b/sympa/locale/it_IT/fusiondirectory.po
index b76686188cbff79ad5ea964bd8df272ca1f06841..3b020e050823df7887f71484f569bfd5a37f578a 100644
--- a/sympa/locale/it_IT/fusiondirectory.po
+++ b/sympa/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/sympa/locale/lv/fusiondirectory.po b/sympa/locale/lv/fusiondirectory.po
index 4b769f2a6922a334b14f0226ca727b6555fce45f..f977142feede79f6acc753bf774b9b7c1eccde9b 100644
--- a/sympa/locale/lv/fusiondirectory.po
+++ b/sympa/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/sympa/locale/nb/fusiondirectory.po b/sympa/locale/nb/fusiondirectory.po
index 3f20348b9a4a553e32152cd2ecd8ffc770a870af..a600080a8e34224c5a000c61f8c2cb164f319e7b 100644
--- a/sympa/locale/nb/fusiondirectory.po
+++ b/sympa/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/sympa/locale/nl/fusiondirectory.po b/sympa/locale/nl/fusiondirectory.po
index 0fbe33712cb6eb6d5db7045cef9a03af9bacf6cd..69d35bbd2043c8b09599c7d07067dffb60448ed3 100644
--- a/sympa/locale/nl/fusiondirectory.po
+++ b/sympa/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/sympa/locale/pl/fusiondirectory.po b/sympa/locale/pl/fusiondirectory.po
index 929aef6648d9cc60ceed2f2e398747d20de79c42..edd84a6a51b2121f996e38252fea8212e81704e6 100644
--- a/sympa/locale/pl/fusiondirectory.po
+++ b/sympa/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/sympa/locale/pt/fusiondirectory.po b/sympa/locale/pt/fusiondirectory.po
index 51d134bfc62b588040aa60282aa5fbceee31925b..2a262dde0e0eba18418e4da66b4c4964313307f6 100644
--- a/sympa/locale/pt/fusiondirectory.po
+++ b/sympa/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/sympa/locale/pt_BR/fusiondirectory.po b/sympa/locale/pt_BR/fusiondirectory.po
index a555500713cbc6cdb65b9f1a4c93a447277bbf90..f7c23c5bfa6ce4c28771d4ad43cf62e28e29925b 100644
--- a/sympa/locale/pt_BR/fusiondirectory.po
+++ b/sympa/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/sympa/locale/ru/fusiondirectory.po b/sympa/locale/ru/fusiondirectory.po
index 2228a1aa2ef9fa8482c7633d4185e490f5653109..6a59149fd44715dae8212d584f139b83597a042a 100644
--- a/sympa/locale/ru/fusiondirectory.po
+++ b/sympa/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/sympa/locale/ru@petr1708/fusiondirectory.po b/sympa/locale/ru@petr1708/fusiondirectory.po
index fa0aaad7421cead8552caf25215083a1f498e1f7..d22c56567630ebbc705bb2595ec4fde28c172608 100644
--- a/sympa/locale/ru@petr1708/fusiondirectory.po
+++ b/sympa/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/sympa/locale/sv/fusiondirectory.po b/sympa/locale/sv/fusiondirectory.po
index a8459284dad8a3b9135f759a308ebfe11f2ecced..77eeef3ae09b8aef036530ba3b06c53e8fa16cd3 100644
--- a/sympa/locale/sv/fusiondirectory.po
+++ b/sympa/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/sympa/locale/ug/fusiondirectory.po b/sympa/locale/ug/fusiondirectory.po
index e1d7200039745733643b34e76682e540e4e9a495..8bf41090618cd3b485d18ec948e8717efb85df92 100644
--- a/sympa/locale/ug/fusiondirectory.po
+++ b/sympa/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/sympa/locale/vi_VN/fusiondirectory.po b/sympa/locale/vi_VN/fusiondirectory.po
index 5fc40c15a08719c8d25a7d932e5b51db6d3e3709..50824b0bf3d9e8c1936550a8ae3a59c73c36d8c4 100644
--- a/sympa/locale/vi_VN/fusiondirectory.po
+++ b/sympa/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/sympa/locale/zh/fusiondirectory.po b/sympa/locale/zh/fusiondirectory.po
index e18d75d5fed0f9cbb445123480ea8e28c21637a7..57d48425eff55806ca6a578bbbb2db4eae1b33f3 100644
--- a/sympa/locale/zh/fusiondirectory.po
+++ b/sympa/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/systems/addons/dashboard/class_dashBoardNetwork.inc b/systems/addons/dashboard/class_dashBoardNetwork.inc
index d37f7ed045c072dd9f29ea77f45fc05dadb71c53..14bc373d2f06c367bbeb80c607981b510d97b826 100644
--- a/systems/addons/dashboard/class_dashBoardNetwork.inc
+++ b/systems/addons/dashboard/class_dashBoardNetwork.inc
@@ -21,12 +21,12 @@
 
 class dashboardNetwork extends simplePlugin
 {
-  /* Return plugin informations for acl handling  */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
       'plShortName'   => _('Network'),
-      'plDescription' => _('Statistics and various informations'),
+      'plDescription' => _('Statistics and various information'),
       'plObjectType'  => array('dashboard'),
 
       'plProvidedAcls'    => array()
diff --git a/systems/addons/dashboard/class_dashBoardSystems.inc b/systems/addons/dashboard/class_dashBoardSystems.inc
index 13e03a26f2445d4d17431084768efd2cc1a295b2..dec5f8c6802f24504dbaf51d70206342ea57b53f 100644
--- a/systems/addons/dashboard/class_dashBoardSystems.inc
+++ b/systems/addons/dashboard/class_dashBoardSystems.inc
@@ -27,7 +27,7 @@ class dashboardSystems extends simplePlugin
   {
     return array(
       'plShortName'   => _('Systems'),
-      'plDescription' => _('Statistics and informations about systems'),
+      'plDescription' => _('Statistics and information about systems'),
       'plObjectType'  => array('dashboard'),
 
       'plProvidedAcls'  => array()
diff --git a/systems/admin/systems/class_componentGeneric.inc b/systems/admin/systems/class_componentGeneric.inc
index 7bec36383ca483cc478ce9efa0f4abb9b315bfd5..1a83b083fc34811f428e32ef5f0f0e0adec13285 100644
--- a/systems/admin/systems/class_componentGeneric.inc
+++ b/systems/admin/systems/class_componentGeneric.inc
@@ -29,7 +29,7 @@ class componentGeneric extends systemSimplePluginGlue
 
   var $preInitAttributes = array('cn', 'networkSettings');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -46,7 +46,7 @@ class componentGeneric extends systemSimplePluginGlue
         )
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/systems/admin/systems/class_mobilePhoneGeneric.inc b/systems/admin/systems/class_mobilePhoneGeneric.inc
index f2bba46484ab8e035e97bc4b963e98509f90532b..f0977982cbe2ec984528d6b51d5c2a64a8170f26 100644
--- a/systems/admin/systems/class_mobilePhoneGeneric.inc
+++ b/systems/admin/systems/class_mobilePhoneGeneric.inc
@@ -46,7 +46,7 @@ class mobilePhoneGeneric extends systemSimplePluginGlue
         )
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/systems/admin/systems/class_phoneGeneric.inc b/systems/admin/systems/class_phoneGeneric.inc
index 269a9d78a4f3b90f7aaa0528ac26775f1812190c..b074f9d20ff8df8b2bfeab86339e86cbcd68c779 100644
--- a/systems/admin/systems/class_phoneGeneric.inc
+++ b/systems/admin/systems/class_phoneGeneric.inc
@@ -45,7 +45,7 @@ class phoneGeneric extends systemSimplePluginGlue
         )
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/systems/admin/systems/class_printGeneric.inc b/systems/admin/systems/class_printGeneric.inc
index bf5a6d2ee7539994504e90f4efcd7b1efadeb847..11c0ef38f7fdec4b737440ade0eb67d68cb550b2 100644
--- a/systems/admin/systems/class_printGeneric.inc
+++ b/systems/admin/systems/class_printGeneric.inc
@@ -23,7 +23,7 @@ class printGeneric extends simplePlugin
 {
   var $objectclasses  = array('fdPrinter', 'ipHost', 'ieee802Device');
 
-  /* Return plugin informations */
+  /* Return plugin information */
   static function plInfo()
   {
     return array(
@@ -44,7 +44,7 @@ class printGeneric extends simplePlugin
         'fdPrinterAdminUsers' => 'user',
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/systems/admin/systems/class_serverGeneric.inc b/systems/admin/systems/class_serverGeneric.inc
index 85ff7039b6aea4c00367e20106df24d3531e932c..2efb6389256f21251dcbf81342b6a6df856ea665 100644
--- a/systems/admin/systems/class_serverGeneric.inc
+++ b/systems/admin/systems/class_serverGeneric.inc
@@ -25,7 +25,7 @@ class serverGeneric extends workstationGeneric
 
   var $inheritance = FALSE;
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -42,7 +42,7 @@ class serverGeneric extends workstationGeneric
           'tabClass'    => 'servtabs',
         )
       ),
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/systems/admin/systems/class_serverService.inc b/systems/admin/systems/class_serverService.inc
index a8858f2e2fa8800c9d61f133dbd671028962b7fd..c1454adb500b97e8a4f7cab0adfeb82f9221a593 100644
--- a/systems/admin/systems/class_serverService.inc
+++ b/systems/admin/systems/class_serverService.inc
@@ -50,7 +50,7 @@ class ServerService extends management
 
   var $is_account;
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -390,7 +390,7 @@ class ServerService extends management
     }
 
     /* Is this an existing action */
-    if (!isset(self::$actionStatus[$action])) {
+    if (!isset(static::$actionStatus[$action])) {
       msg_dialog::display(_("Error"), _("Unknown action $action"), ERROR_DIALOG);
       return;
     }
@@ -436,8 +436,8 @@ class ServerService extends management
               sprintf(_("Could not get execute action %s on service %s."), $action, $service),
               msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
             );
-          } elseif (preg_match("/^done/", $res)) {
-            $this->plugins[$service]->setStatus(self::$actionStatus[$action]);
+          } elseif (preg_match('/^done/', $res)) {
+            $this->plugins[$service]->setStatus(static::$actionStatus[$action]);
           }
         }
       }
diff --git a/systems/admin/systems/class_systemManagement.inc b/systems/admin/systems/class_systemManagement.inc
index 7174bb9315d91518569ebd6b3ed5a7274b40b30c..ab58a71401a0da5de01fe07543ef815c546e0b57 100644
--- a/systems/admin/systems/class_systemManagement.inc
+++ b/systems/admin/systems/class_systemManagement.inc
@@ -123,6 +123,13 @@ class systemManagement extends management
     return parent::copyPasteHandler($action, $target, $all, $tabClass, $tabType, $aclCategory, $aclPlugin);
   }
 
+  function configureFilter ()
+  {
+    parent::configureFilter();
+    /* We need all attributes to list services */
+    $this->filter->query[0]['attribute'] = '*';
+  }
+
   /*! \brief    Handle Argonaut events
    *            All schedules and triggered events are handled here.
    */
@@ -648,7 +655,7 @@ class systemManagement extends management
     return "&nbsp;";
   }
 
-  static function listServices($row, $dn)
+  static function listServices($row, $dn, $attrs)
   {
     global $config;
     static $services = array();
@@ -663,10 +670,8 @@ class systemManagement extends management
     }
 
     // Load information if needed
-    $ldap = $config->get_ldap_link();
-    $ldap->cat($dn);
     $services_imgs = array();
-    if ($attrs = $ldap->fetch()) {
+    if (!empty($attrs)) {
       foreach ($services as $class => $service) {
         if ($service->is_this_account($attrs)) {
           $infos = pluglist::pluginInfos($class);
diff --git a/systems/admin/systems/class_terminalGeneric.inc b/systems/admin/systems/class_terminalGeneric.inc
index 80792d2703453461e06c008df13d18d7f5ec4b2d..eee8ae4a9e6e06b4742be17b7b29bf8865a8860d 100644
--- a/systems/admin/systems/class_terminalGeneric.inc
+++ b/systems/admin/systems/class_terminalGeneric.inc
@@ -25,7 +25,7 @@ class terminalGeneric extends workstationGeneric
 
   var $inheritance = array('gotoWorkstationTemplate' => 'member', 'gotoTerminalTemplate' => 'member');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -42,7 +42,7 @@ class terminalGeneric extends workstationGeneric
         )
       ),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -57,83 +57,13 @@ class terminalGeneric extends workstationGeneric
     if ($rdn === NULL) {
       $rdn = get_ou('terminalRDN');
     }
-    $attributesInfo = parent::getAttributesInfo($word, $rdn);
-    $attributesInfo['servers'] = array(
-      'name'  => _('Servers'),
-      'icon'  => 'geticon.php?context=devices&icon=server&size=16',
-      'attrs' => array(
-        new SelectAttribute(
-          _('Root server'),
-          sprintf(_('The root server the terminal should be using'), $word),
-          'gotoTerminalPath',
-          FALSE
-        ),
-        new SelectAttribute(
-          _('Swap server'),
-          sprintf(_('The swap server the terminal should be using'), $word),
-          'gotoSwapServer',
-          FALSE
-        )
-      )
-    );
-    $attributesInfo['remote_desktop'] = array(
-      'name'  => _('Remote desktop'),
-      'icon'  => 'geticon.php?context=devices&icon=server&size=16',
-      'attrs' => array(
-        new SelectAttribute(
-          _('Connect method'), _('Connect method'),
-          'gotoXMethod', FALSE,
-          array('', 'xdmcp', 'ldm', 'shell', 'telnet', 'rdp'),
-          '',
-          array(_('None'), _('XDMCP'), _('LDM'), _('Shell'), _('Telnet'), _('Windows RDP'))
-        ),
-        new SetAttribute(
-          new SelectAttribute(
-            _('Terminal server'), _('Terminal server'),
-            'gotoXdmcpServer', FALSE,
-            array()
-          )
-        )
-      )
-    );
-    $attributesInfo['remote_desktop']['attrs'][0]->setSubmitForm(TRUE);
-    return $attributesInfo;
+    return parent::getAttributesInfo($word, $rdn);
   }
 
   function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
   {
     global $config;
     parent::__construct($dn, $object, $parent, $mainTab);
-
-    /* Root server */
-    $tmp        = $config->data['SERVERS']['NFS'];
-    $tmp_output = $tmp;
-    if (($key = array_search("default", $tmp)) !== FALSE) {
-      if ($this->member_of_group) {
-        $tmp[$key] = "";
-        $tmp_output[$key] = _('inherited');
-      } else {
-        unset($tmp[$key]);
-        unset($tmp_output[$key]);
-      }
-    }
-    $this->attributesInfo['servers']['attrs']['gotoTerminalPath']->setChoices($tmp, $tmp_output);
-
-    /* Swap server */
-    $tmp        = $config->data['SERVERS']['NBD'];
-    $tmp_output = $tmp;
-    array_unshift($tmp, '!');
-    array_unshift($tmp_output, _('Local swap'));
-    if (($key = array_search("default", $tmp)) !== FALSE) {
-      if ($this->member_of_group) {
-        $tmp[$key] = "";
-        $tmp_output[$key] = _('inherited');
-      } else {
-        unset($tmp[$key]);
-        unset($tmp_output[$key]);
-      }
-    }
-    $this->attributesInfo['servers']['attrs']['gotoSwapServer']->setChoices($tmp, $tmp_output);
   }
 
   /* Returns the dn of the entry */
@@ -141,23 +71,6 @@ class terminalGeneric extends workstationGeneric
   {
     return 'cn='.ldap_escape_dn($this->cn).','.get_ou('terminalRDN').$this->base;
   }
-
-  function execute()
-  {
-    global $config;
-    /* Create a list of useable servers for the currently selected
-     *  connection type.
-     */
-    $xdmcp_types        = $config->data['SERVERS']['TERMINAL_SESSION_TYPES'];
-    $available_servers  = array();
-    foreach ($xdmcp_types as $servername => $supported_types) {
-      if (in_array(strtoupper(get_post('gotoXMethod')), $supported_types)) {
-        $available_servers[] = $servername;
-      }
-    }
-    $this->attributesInfo['remote_desktop']['attrs']['gotoXdmcpServer']->attribute->setChoices($available_servers);
-    return parent::execute();
-  }
 }
 
 ?>
diff --git a/systems/admin/systems/class_terminalStartup.inc b/systems/admin/systems/class_terminalStartup.inc
index 150b1688f5c22c851915c411da3da31fb34b68b5..1482e778d77cadf78885a5748fac98ec2bb32a8b 100644
--- a/systems/admin/systems/class_terminalStartup.inc
+++ b/systems/admin/systems/class_terminalStartup.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
@@ -20,38 +19,26 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class TerminalReleaseAttribute extends SelectAttribute
+class terminalStartup extends simplePlugin
 {
-  function __construct ($label, $description, $ldapName, $required, $choices = array())
-  {
-    parent::__construct($label, $description, $ldapName, $required, $choices);
-    $this->setSubmitForm(TRUE);
-  }
+  var $objectclasses = array('fdTerminalStartup');
 
-  function setValue ($value)
-  {
-    if (!in_array($value, $this->choices)) {
-      return;
-    }
-    parent::setValue($value);
-    if (isset($this->plugin)) {
-      $this->plugin->attributesInfo['main']['attrs']['gotoBootKernel']->setRelease($value);
-    }
-  }
+  var $inheritance = array('gosaGroupOfNames' => 'member');
 
-  function setParent (&$plugin)
+  /* Return plugin information */
+  static function plInfo()
   {
-    parent::setParent($plugin);
-    $this->setValue('squeeze');
-  }
-}
-
-class terminalStartup extends simplePlugin
-{
-  /* attribute list for save action */
-  var $objectclasses = array('GOhard');
+    return array(
+      'plShortName'     => _('Startup'),
+      'plDescription'   => _('Terminal startup'),
+      'plSelfModify'    => FALSE,
+      'plPriority'      => 2,
+      'plCategory'      => array('terminal'),
+      'plObjectType'    => array('terminal', 'ogroup-dynamic'),
 
-  var $inheritance = array("gosaGroupOfNames" => "member");
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
 
   /*!
    *  \brief The main function : information about attributes
@@ -62,31 +49,89 @@ class terminalStartup extends simplePlugin
       'startup' => array (
         'name' => _('Startup parameters'),
         'attrs' => array (
-          new StringAttribute (
-            _('Boot kernel'),  _('Linux kernel to be installed and booted'),
-            'gotoBootKernel', FALSE
+          new SelectAttribute(
+            _('Root server'), _('The root server the terminal should be using'),
+            'gotoTerminalPath', FALSE
           ),
-          new StringAttribute (
-            _('Boot kernel parameters'), _('Linux kernel parameters to be ran'),
-            'gotoKernelParameters', FALSE
+          new SelectAttribute(
+            _('Swap server'), _('The swap server the terminal should be using'),
+            'gotoSwapServer', FALSE
+          ),
+        )
+      ),
+      'remote_desktop' => array(
+        'name'  => _('Remote desktop'),
+        'icon'  => 'geticon.php?context=devices&icon=server&size=16',
+        'attrs' => array(
+          new SelectAttribute(
+            _('Connect method'), _('Connect method'),
+            'gotoXMethod', FALSE,
+            array('XDMCP', 'LDM', 'SHELL', 'TELNET', 'RDP'),
+            '',
+            array(_('XDMCP'), _('LDM'), _('Shell'), _('Telnet'), _('Windows RDP'))
+          ),
+          new SetAttribute(
+            new SelectAttribute(
+              _('Terminal server'), _('Terminal server'),
+              'gotoXdmcpServer', FALSE,
+              array()
+            )
           )
         )
       ),
     );
   }
 
-  /* Return plugin informations for acl handling */
-  static function plInfo()
+  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
   {
-    return array(
-      'plShortName'     => _('Startup'),
-      'plDescription'   => _('Terminal startup'),
-      'plSelfModify'    => FALSE,
-      'plPriority'      => 3,
-      'plObjectType'    => array('terminal', 'ogroup-dynamic'),
+    global $config;
+    parent::__construct($dn, $object, $parent, $mainTab);
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
-    );
+    $this->attributesAccess['gotoXMethod']->setSubmitForm('updateServerList');
+
+    /* Get NFS and NBD server lists */
+    $nfs = array();
+    $nbd = array();
+    $shareServers = objects::ls('server', array('cn' => 1, 'goExportEntry' => '*'), NULL, '(&(objectClass=goShareServer)(goExportEntry=*))');
+    foreach ($shareServers as $server) {
+      foreach ($server['goExportEntry'] as $entry) {
+        $parts = explode('|', $entry);
+        if ($parts[2] == 'NFS') {
+          $nfs[] = $server['cn'].':'.$parts[4];
+        } elseif ($parts[2] == 'NBD') {
+          $nbd[] = $server['cn'].':'.$parts[4];
+        }
+      }
+    }
+
+    /* Root server */
+    $tmp        = $nfs;
+    $tmp_output = $nfs;
+    if ($this->member_of_group) {
+      array_unshift($tmp, '');
+      array_unshift($tmp_output, _('inherited'));
+    }
+    $this->attributesAccess['gotoTerminalPath']->setChoices($tmp, $tmp_output);
+
+    /* Swap server */
+    $tmp        = $nbd;
+    $tmp_output = $nbd;
+    array_unshift($tmp, '!');
+    array_unshift($tmp_output, _('Local swap'));
+    if ($this->member_of_group) {
+      array_unshift($tmp, '');
+      array_unshift($tmp_output, _('inherited'));
+    }
+    $this->attributesAccess['gotoSwapServer']->setChoices($tmp, $tmp_output);
+
+    $this->updateServerList();
+  }
+
+  /*! \brief Create a list of useable servers for the currently selected protocol */
+  function updateServerList()
+  {
+    $servers = objects::ls('server', NULL, NULL, '(&(objectClass=goTerminalServer)(gotoSessionType='.strtoupper($this->gotoXMethod).'))');
+    $this->attributesAccess['gotoXdmcpServer']->attribute->setChoices($servers);
   }
 }
 
diff --git a/systems/admin/systems/class_workstationGeneric.inc b/systems/admin/systems/class_workstationGeneric.inc
index aafb9762e2ce3e855c6d4759070bd54c3a7f3bac..4a631253f91d6e756dd600518bc8319ed96becc7 100644
--- a/systems/admin/systems/class_workstationGeneric.inc
+++ b/systems/admin/systems/class_workstationGeneric.inc
@@ -62,8 +62,10 @@ class systemSimplePluginGlue extends simplePlugin
 
   protected function attributeHaveChanged($field)
   {
-    if (($field == 'ipHostNumber') || ($field == 'macAddress')) {
+    if ($field == 'ipHostNumber') {
       return array_differs($this->attributeInitialValue($field), $this->attributeValue($field));
+    } elseif ($field == 'macAddress') {
+      return ($this->attributeInitialValue($field) != $this->attributeValue($field));
     } else {
       return parent::attributeHaveChanged($field);
     }
@@ -80,13 +82,20 @@ class systemSimplePluginGlue extends simplePlugin
 
   protected function attributeInitialValue($field)
   {
-    if (($field == 'ipHostNumber') || ($field == 'macAddress')) {
+    if ($field == 'ipHostNumber') {
       $initialValue = $this->previousNetworkSavedAttributes[$field];
       if (is_array($initialValue)) {
         return $initialValue;
       } else {
         return array($initialValue);
       }
+    } elseif ($field == 'macAddress') {
+      $initialValue = $this->previousNetworkSavedAttributes[$field];
+      if (is_array($initialValue)) {
+        return $initialValue[0];
+      } else {
+        return $initialValue;
+      }
     } else {
       return parent::attributeInitialValue($field);
     }
@@ -111,7 +120,7 @@ class workstationGeneric extends systemSimplePluginGlue
 
   var $preInitAttributes = array('cn', 'networkSettings');
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -128,7 +137,7 @@ class workstationGeneric extends systemSimplePluginGlue
           'mainAttr'    => 'cn',
         )
       ),
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/systems/admin/systems/services/ldap/class_serviceLDAP.inc b/systems/admin/systems/services/ldap/class_serviceLDAP.inc
index 73bac2c30e847f5d5a6ec1cef7d0ffc125557be4..330652dda8e3942755ba21b4a6e889003ec30828 100644
--- a/systems/admin/systems/services/ldap/class_serviceLDAP.inc
+++ b/systems/admin/systems/services/ldap/class_serviceLDAP.inc
@@ -89,7 +89,7 @@ class serviceLDAP extends simpleService
     );
   }
 
-  /* Return plugin informations for acl handling */
+  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -97,7 +97,7 @@ class serviceLDAP extends simpleService
       'plDescription' => _('LDAP').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=applications&icon=ldap&size=16',
 
-      'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 }
diff --git a/systems/admin/systems/services/shares/class_serviceShare.inc b/systems/admin/systems/services/shares/class_serviceShare.inc
index f08bed9f5443d3b49fed7929fc7c4c0ed6f6920f..5401e0bc8fad1bf29dada1701e06b4c72c7a6ada 100644
--- a/systems/admin/systems/services/shares/class_serviceShare.inc
+++ b/systems/admin/systems/services/shares/class_serviceShare.inc
@@ -30,7 +30,7 @@ class serviceShare extends simpleService
       'plDescription' => _('Share service').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=places&icon=folder-network&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/systems/admin/systems/services/terminal/class_serviceTerminal.inc b/systems/admin/systems/services/terminal/class_serviceTerminal.inc
index aa2b83122e29c9ccdd814fb3267c163fc0b691ed..264159af9b246e283943da535e6e820665d5cd6a 100644
--- a/systems/admin/systems/services/terminal/class_serviceTerminal.inc
+++ b/systems/admin/systems/services/terminal/class_serviceTerminal.inc
@@ -30,7 +30,7 @@ class serviceTerminal extends simpleService
       'plDescription' => _('Terminal service').' ('._('Services').')',
       'plIcon'        => 'geticon.php?context=devices&icon=terminal&size=16',
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -54,9 +54,9 @@ class serviceTerminal extends simpleService
               _('Supported session types'),
               _('The session types supported by this terminal server'),
               'gotoSessionType', FALSE,
-              array('LDM','XDMCP', 'SHELL', 'RDP', 'TELNET'),
+              array('XDMCP', 'LDM', 'SHELL', 'TELNET', 'RDP'),
               '',
-              array('LDM','XDMCP', 'SHELL', 'RDP', 'TELNET')
+              array(_('XDMCP'), _('LDM'), _('Shell'), _('Telnet'), _('Windows RDP'))
             )
           )
         )
diff --git a/systems/admin/systems/system-list.xml b/systems/admin/systems/system-list.xml
index 1120da489fd5431f66e4230a9f32df15901236da..f3dbbe7ccb4878f59b8685a15b04d0260d40a1a2 100644
--- a/systems/admin/systems/system-list.xml
+++ b/systems/admin/systems/system-list.xml
@@ -152,7 +152,7 @@
       <label>Services</label>
       <sortAttribute>services</sortAttribute>
       <sortType>string</sortType>
-      <value>%{filter:listServices(row,dn)}</value>
+      <value>%{filter:listServices(row,dn,entry)}</value>
       <export>true</export>
     </column>
 
diff --git a/systems/config/systems/class_systemsPluginConfig.inc b/systems/config/systems/class_systemsPluginConfig.inc
index 99a747ef4b15ac17091340df0e8b7273b7778ed1..e66f55b12f218707001c091671965d4bf17c691f 100644
--- a/systems/config/systems/class_systemsPluginConfig.inc
+++ b/systems/config/systems/class_systemsPluginConfig.inc
@@ -29,7 +29,7 @@ class systemsPluginConfig extends simplePlugin
       'plDescription'   => _('Systems plugin configuration'),
       'plObjectType'    => array('configuration'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/systems/contrib/openldap/service-fd.schema b/systems/contrib/openldap/service-fd.schema
index 6e756e607ad45ddebecae9e7f62f86badf7102f3..c79fc9345bc08d21fff16a30442cffe08e73be98 100644
--- a/systems/contrib/openldap/service-fd.schema
+++ b/systems/contrib/openldap/service-fd.schema
@@ -240,7 +240,7 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.78 NAME 'avChecksPerDay'
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.9.82 NAME 'gotoSessionType'
   DESC 'Supported type of session for a terminal server'
-  EQUALITY caseExactIA5Match
+  EQUALITY caseIgnoreIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
 ##
diff --git a/systems/contrib/openldap/systems-fd.schema b/systems/contrib/openldap/systems-fd.schema
index d3728618739213d174cd8565d0d88fc3aa04a0c7..345774b8da633710e694070a35020abfba7e5afc 100644
--- a/systems/contrib/openldap/systems-fd.schema
+++ b/systems/contrib/openldap/systems-fd.schema
@@ -628,3 +628,9 @@ objectclass ( 1.3.6.1.4.1.38414.16.2.7 NAME 'fdPhone'
   DESC 'FusionDirectory phone class'
   MUST ( cn )
   MAY ( description $ telephoneNumber ) )
+
+objectclass (1.3.6.1.4.1.38414.16.2.8 NAME 'fdTerminalStartup'
+  DESC 'GOto - Gonicus Terminal Concept, objectclass'
+  SUP top AUXILIARY
+  MUST ( )
+  MAY  ( gotoXdmcpServer $ gotoXMethod $ gotoTerminalPath $ gotoSwapServer ))
diff --git a/systems/locale/ar/fusiondirectory.po b/systems/locale/ar/fusiondirectory.po
index 49f26d36e8472f03a2fb7ab4a9eea2f49acfdcf0..d13bcefd2a7770ca60ead8e2cb4f9ba968b01d5f 100644
--- a/systems/locale/ar/fusiondirectory.po
+++ b/systems/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ 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"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "أنظمة"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "خادم"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr ""
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "الخواص"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "البداية"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "البداية"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "خطأ"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "النوع"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "إختيار"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "تحذير"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr "تحكم الأنظمة"
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/ca/fusiondirectory.po b/systems/locale/ca/fusiondirectory.po
index f5e619a6f9253479f89cad8e21beae701892ea93..cb3cb8136b73b97809dfa26691eb351de15cfe1d 100644
--- a/systems/locale/ca/fusiondirectory.po
+++ b/systems/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Intèrpret d'ordres"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Error"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Localització"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Avís"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Intèrpret d'ordres"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/cs_CZ/fusiondirectory.po b/systems/locale/cs_CZ/fusiondirectory.po
index fb6a9f10fea411b8958989523a258d753b6b9ca1..7218285f4db90ff7ba7932b6d834a5365b5a5597 100644
--- a/systems/locale/cs_CZ/fusiondirectory.po
+++ b/systems/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Síť"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Statistiky a různé další údaje"
+msgid "Statistics and various information"
+msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
 msgid "DHCP"
@@ -34,55 +34,54 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Systémy"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr "Statistiky a informace o systémech"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr "Název počítače, určeného pro použití touto jednotkou"
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr "Pracovní stanice"
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Servery"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr "Pracovní stanice s MS Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr "Terminály"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr "Tiskárny"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr "Telefony"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr "Součásti"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr "Mobilní telefony"
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr "Uzamčeno"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr "stránkovat (swap) na místní úložiště"
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "převzaté"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr "Služba infrastruktury"
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr "Analýza systému"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Chyba LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr "návěstí akce"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Kořenový server"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Server pro odkládání paměti"
@@ -319,8 +318,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr "Upravit službu"
 msgid "Remove service"
 msgstr "Odebrat službu"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr "IP adresa %s"
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "IP adresa"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "MAC adresa"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr "Síťové zařízení"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Vlastnosti"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr "Kód PUK"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Kód PUK SIM karty v tomto mobilním telefonu"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Po spuštění"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr "Spuštění terminálu"
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Parametry zavádění systému"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "zaváděné jádro"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr "Kořenový server, který by měl terminál používat"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Jádro Linux, které má být nainstalováno a zavedeno"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
+msgstr "Odkládací (swap) server, který by měl terminál používat"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Parametry zavádění jádra"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Vzdálená plocha"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Parametry jádra Linux, se kterými má být zavedeno"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Způsob připojování"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Po spuštění"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Spuštění terminálu"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "shell"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Terminálový server"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr "Služby serveru"
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Chyba"
 
@@ -574,46 +602,46 @@ msgstr "Stav služby nelze aktualizovat dokud nebude uložena!"
 msgid "Could not get execute action %s on service %s."
 msgstr "Nelze spustit akci %s na službě %s."
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Počítač"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr "Informace o počítači"
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "Počítač"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr "Název %s"
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr "Stručný popis %s"
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Umístění"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr "Umístění %s"
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr "Uzamknout toto %s"
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Toto zabrání %s v tom, aby bylo opětovně nainstalováno"
@@ -663,69 +691,69 @@ msgstr "Podporované typy sezení"
 msgid "The session types supported by this terminal server"
 msgstr "Typy sezení, podporované tímto terminálovým serverem"
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr "Služba sdílení"
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Sdílení"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr "Sdílení, která tento server poskytuje"
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr "Název tohoto sdílení"
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr "Popis tohoto sdílení"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Typ"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr "Typ sdílení"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "znaková strana"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr "Typ kódování znaků v názvech na tomto sdílení"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr "Popis umístění / Svazek"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr "Umístění či svazek, související s tímto sdílením"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Předvolba"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr "Speciální předvolby pro toto sdílení"
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr "Nejprve je třeba nastavit kódování znaků"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Varování"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Neplatná hodnota v kódování znaků : %s"
@@ -924,44 +952,44 @@ msgstr "Sériové číslo telefonu"
 msgid "The telephone number of the phone"
 msgstr "Telefonní číslo telefonu"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Oprávnění"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Nejste oprávněni pořídit zachycený stav %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Nejste oprávněni obnovit zachycený stav %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr "Převzato z %s"
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr "Správa systémů"
 
@@ -1055,52 +1083,6 @@ msgstr "Informace o terminálu"
 msgid "terminal"
 msgstr "terminál"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Kořenový server, který by měl terminál používat"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "Odkládací (swap) server, který by měl terminál používat"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Vzdálená plocha"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Způsob připojování"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "žádné"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Terminálový server"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr "Je zde hned několik argonaut serverů! (to zatím není podporováno)"
diff --git a/systems/locale/de/fusiondirectory.po b/systems/locale/de/fusiondirectory.po
index 2ff51bd77b521abf01a0c057fa9b79f32a462550..802836b17585ad5d89dabb4218c75f03fb6c94ae 100644
--- a/systems/locale/de/fusiondirectory.po
+++ b/systems/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Netzwerk"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Statistiken und verschiedene Informationen"
+msgid "Statistics and various information"
+msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
 msgid "DHCP"
@@ -34,55 +34,54 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Systeme"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr "Statistiken und Informationen über Systeme"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr "Computername, der von Einheit genutzt werden soll"
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr "Arbeitsstationen"
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Server"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr "Windows Workstations"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr "Terminals"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr "Drucker"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr "Telefone"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr "Komponenten"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr "Mobiltelefone"
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr "Gesperrt"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr "Lokaler Auslagerungsspeicher"
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "geerbt"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr "Infrastrukturdienst"
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr "Systemanalyse"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr "Ablaufstatus"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Root-Server"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Auslagerungsaerver"
@@ -319,8 +318,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr "Dienst bearbeiten"
 msgid "Remove service"
 msgstr "Dienst entfernen"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr "IP-Adresse %s"
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "IP-Adresse"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr "Netzwerkgerät"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Eigenschaften"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr "PUK-Nummer"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Die PUK-Nummer der SIM-Karte in diesem Mobiltelefon"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Start"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr "Terminal-Start"
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Startparameter"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Boot-Kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr "Der root-Server den das Terminal verwenden sollte"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Zu installierender und bootender Linux-Kernel"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
+msgstr "Der swap-Server den das Terminal verwenden sollte"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Boot Kernel Parameter"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Entfernte Arbeitsfläche"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Linux Kernel Parameter, die gestartet werden sollen"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Verbindungsmethode"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Start"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Terminal-Start"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Terminal-Server"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr "Serverdienste"
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Fehler"
 
@@ -574,46 +602,46 @@ msgstr "Kann den Dienststatus nicht aktualisieren bis er gespeichert wurde!"
 msgid "Could not get execute action %s on service %s."
 msgstr "Konnte ausführbare Aktion %s auf Dienst %s nicht bekommen."
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr "Arbeitsstationinformation"
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "Arbeitsstation"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr "Der Name der %s"
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr "Eine kurze Beschreibung der %s"
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Ort"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr "Der Ort des %s"
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr "Sperren dieser %s"
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Dies wird verhindern dass %s neu installiert wird"
@@ -663,69 +691,69 @@ msgstr "Unterstützte Sitzungstypen"
 msgid "The session types supported by this terminal server"
 msgstr "Die von diesem Terminalserver unterstützten Sitzungstypen"
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr "Freigabendienst"
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Freigaben"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr "Freigaben, die dieser Server hostet"
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr "Name dieser Freigabe"
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr "Beschreibung dieser Freigabe"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Typ"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr "Typ der Freigabe"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Codeseite"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr "Codeseite für diese Freigabe"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr "Pfad / Volumen"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr "Pfad oder Volumen, die diese Freigabe betrifft"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Option"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr "Spezielle Option(en) für diese Freigabe"
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr "Sie müssen zuerst die Kodierungen konfigurieren"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Warnung"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Ungültiger Wert in Kodierungen : %s"
@@ -924,44 +952,44 @@ msgstr "Die Seriennummer des Telefons"
 msgid "The telephone number of the phone"
 msgstr "Die Telefonnumer des Telefons"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr "Geerbt von %s"
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr "Systemverwaltung"
 
@@ -1055,52 +1083,6 @@ msgstr "Terminalinformation"
 msgid "terminal"
 msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Der root-Server den das Terminal verwenden sollte"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "Der swap-Server den das Terminal verwenden sollte"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Entfernte Arbeitsfläche"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Verbindungsmethode"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Keine"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Terminal-Server"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr "Es gibt mehrere argonaut-Server! (dies wird noch nicht unterstützt)"
diff --git a/systems/locale/el_GR/fusiondirectory.po b/systems/locale/el_GR/fusiondirectory.po
index 7bcc81aa9862571566210bc34ee5a7a142329664..1d853ea7c27f727566c3e9987220d09d665e584b 100644
--- a/systems/locale/el_GR/fusiondirectory.po
+++ b/systems/locale/el_GR/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Δίκτυο"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Στατιστικά και ποικίλες πληροφορίες"
+msgid "Statistics and various information"
+msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
 msgid "DHCP"
@@ -37,55 +37,54 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Systems"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr "Στατιστικά και πληροφορίες για το systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr "Στατιστικά"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr "Σταθμοί εργασίας"
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Εξυπηρετητών"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr "Σταθμοί εργασίας Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr "Τερματικά"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr "Εκτυπωτές"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr "Τηλέφωνα"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr "Συστατικά στοιχεία"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr "Κινητά τηλέφωνα"
 
@@ -198,21 +197,21 @@ msgid "Locked"
 msgstr "Κλειδωμένο"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr "Τοπικό swap"
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "κληρονομημένα"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr "Υπηρεσία υποδομής"
 
@@ -258,7 +257,7 @@ msgid "System analysis"
 msgstr "Ανάλυση συστήματος"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
@@ -280,13 +279,13 @@ msgid "Action flag"
 msgstr "Σημαία ενέργειας"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Εξυπηρετητής Root"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Εξυπηρετητής Swap"
@@ -322,8 +321,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -365,29 +364,29 @@ msgstr "Επεξεργασία υπηρεσίας"
 msgid "Remove service"
 msgstr "Αφαίρεση υπηρεσίας"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr "Διεύθυνση IP %s"
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "Διεύθυνση IP"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "Διεύθυνση MAC"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -410,7 +409,7 @@ msgstr "Συσκευή δικτύου:"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -418,8 +417,8 @@ msgstr "Ιδιότητες"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -507,37 +506,66 @@ msgstr "Αριθμός PUK "
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Ο αριθμός PUK  της sim σε αυτό το κινητό"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Εκκίνηση"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr "Εκκίνηση τερματικού"
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Παράμετροι εκκίνησης"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr "Ο εξυπηρετητής root που θα πρέπει να χρησιμοποιεί το τερματικό"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Ο πυρήνας Linux που θα εγκατασταθεί και θα εκκινηθεί"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
+msgstr "Ο εξυπηρετητής swap που θα πρέπει να χρησιμοποιεί το τερματικό"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Παράμετροι εκκίνησης πυρήνα"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Απομακρυσμένη επιφάνεια εργασίας"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Παράμετροι πυρήνα Linux για εκτέλεση"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Μέθοδος σύνδεσης"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Εκκίνηση"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Εκκίνηση τερματικού"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Κέλυφος"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Εξυπηρετητής τερματικού"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -550,7 +578,7 @@ msgstr "Υπηρεσίες εξυπηρετητή"
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -577,46 +605,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr "Δεν ήταν δυνατή η εκτέλεση ενέργειας %s στην υπηρεσία %s."
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Σταθμός εργασίας"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr "Πληροφορίες σταθμού εργασίας"
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "σταθμός εργασίας"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr "Το όνομα του  %s"
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr "Μια σύντομη περιγραφή του %s"
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Τοποθεσία"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr "Η τοποθεσία του %s"
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr "Κλείδωμα του %s"
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Αυτό θα αποτρέψει το %s από το να επανεγκατασταθεί"
@@ -666,69 +694,69 @@ msgstr "Υποστηριζόμενοι τύποι συνεδρίας"
 msgid "The session types supported by this terminal server"
 msgstr "Ο τύποι συνεδρίας που υποστηρίζονται από αυτόν τον εξυπηρετητή τερματικού"
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr "Κοινή χρήση υπηρεσίας"
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Κοινόχρηστα"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr "Κοινή χρήση των συστημάτων ταυτού του εξυπηρετητή"
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr "Το όνομα αυτού του κοινόχρηστου"
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr "Περιγραφή αυτο του κοινόχρηστου"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Τύπος"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr "Τύπος αυτού του κοινόχρηστου"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Σελίδα κώδικα"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr "Κωδικοσελίδα αυτού του κοινόχρηστου"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr "Διαδρομή/ Τόμος"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr "Διαδρομή ή τόμος σχετικός με αυτό το κοινόχρηστο"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Επιλογή"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr "Ειδική επιλογή (ες) για αυτό το μοίρασμα"
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr "Πρέπει να ρυθμίσετε κάποιες κωδικοποιήσεις πρώτα"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Μη έγκυρη τιμή στις κωδικοποιήσεις: %s"
@@ -927,44 +955,44 @@ msgstr "Ο σειριακός αριθμός γραμμής του τηλεφώ
 msgid "The telephone number of the phone"
 msgstr "Ο αριθμός τηλεφώνου "
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Άδεια"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε ένα στιγμιότυπο για  %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Δεν επιτρέπεται να επαναφέρετε ένα στιγμιότυπο για  %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr "Κληρονομήθηκε από %s"
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr "Διαχείριση Systems "
 
@@ -1058,52 +1086,6 @@ msgstr "Πληροφορίες τερματικού"
 msgid "terminal"
 msgstr "τερματικό"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Ο εξυπηρετητής root που θα πρέπει να χρησιμοποιεί το τερματικό"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "Ο εξυπηρετητής swap που θα πρέπει να χρησιμοποιεί το τερματικό"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Απομακρυσμένη επιφάνεια εργασίας"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Μέθοδος σύνδεσης"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Κανένα"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Κέλυφος"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Εξυπηρετητής τερματικού"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr "Υπάρχουν αρκετοί εξυπηρετητές argonaut! (αυτός δεν υποστηρίζεται ακόμη)"
diff --git a/systems/locale/en/fusiondirectory.po b/systems/locale/en/fusiondirectory.po
index 79d7124db321694b7880163b66220dadd024749a..e62010576809792bebdf30015a700b93ac247b86 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -18,604 +18,411 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
-msgid "Local swap"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:108
-#: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
-msgid "inherited"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
-msgid "Infrastructure service"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:191
-msgid "Event error"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:192
-#, php-format
-msgid "Event '%s' is not available!"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Switch off"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
-msgid "LDAP error"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:319
+msgid "Network"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
-#: admin/ogroups/goto/termgroup.tpl.c:17
-msgid "Root server"
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various information"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: addons/dashboard/class_dashBoardSystems.inc:29
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
+msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: addons/dashboard/class_dashBoardSystems.inc:41
+msgid "Statistics"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: addons/dashboard/class_dashBoardSystems.inc:46
+msgid "Computer name to use by unit"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: addons/dashboard/class_dashBoardSystems.inc:72
+msgid "Workstations"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: addons/dashboard/class_dashBoardSystems.inc:75
+msgid "Servers"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: addons/dashboard/class_dashBoardSystems.inc:78
+msgid "Windows Workstations"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: addons/dashboard/class_dashBoardSystems.inc:81
+msgid "Terminals"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: addons/dashboard/class_dashBoardSystems.inc:84
+msgid "Printers"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: addons/dashboard/class_dashBoardSystems.inc:87
+msgid "Phones"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: addons/dashboard/class_dashBoardSystems.inc:90
+msgid "Components"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: addons/dashboard/class_dashBoardSystems.inc:93
+msgid "Mobile phones"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: config/systems/class_systemsPluginConfig.inc:29
+msgid "Systems plugin configuration"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: config/systems/class_systemsPluginConfig.inc:40
+msgid "LDAP tree for systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Systems RDN"
 msgstr ""
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Branch in which systems will be stored"
 msgstr ""
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Server RDN"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Branch in which servers will be stored"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Workstations RDN"
 msgstr ""
 
-#: admin/systems/system-list.xml:128
-msgid "IP"
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Branch in which workstations will be stored"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
-msgid "MAC"
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Terminal RDN"
 msgstr ""
 
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Branch in which terminals will be stored"
 msgstr ""
 
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Printer RDN"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
-msgid "Release"
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Branch in which printers will be stored"
 msgstr ""
 
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Component RDN"
 msgstr ""
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Branch in which network devices will be stored"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Phone RDN"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Branch in which phones will be stored"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Mobile phone RDN"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Branch in which mobile phones will be stored"
 msgstr ""
 
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
+#: config/systems/class_systemsPluginConfig.inc:85
+msgid "Miscellaneous"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
+#: config/systems/class_systemsPluginConfig.inc:89
+msgid "Available encodings for share services"
 msgstr ""
 
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "Encoding"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "The encoding code name"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "Label"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:148
-#: admin/systems/class_phoneGeneric.inc:56
-#: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
-msgid "Properties"
+#: admin/ogroups/goto/class_termgroup.inc:68
+msgid "Activated"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
+#: admin/ogroups/goto/class_termgroup.inc:69
+msgid "Locked"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
+#: admin/ogroups/goto/class_termgroup.inc:102
+#: admin/systems/class_terminalStartup.inc:120
+msgid "Local swap"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
+#: admin/ogroups/goto/class_termgroup.inc:108
+#: admin/ogroups/goto/class_termgroup.inc:120
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
+msgid "inherited"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
+#: admin/ogroups/goto/class_termgroup.inc:187
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/ogroups/goto/class_termgroup.inc:191
+msgid "Event error"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/ogroups/goto/class_termgroup.inc:192
 #, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
+msgid "Event '%s' is not available!"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
+#: admin/ogroups/goto/class_termgroup.inc:223
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
+#: admin/ogroups/goto/class_termgroup.inc:223
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Inf file"
+#: admin/ogroups/goto/class_termgroup.inc:224
+msgid "Instant update"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Path to windows inf file for this printer"
+#: admin/ogroups/goto/class_termgroup.inc:225
+msgid "Scheduled update"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Driver directory"
+#: admin/ogroups/goto/class_termgroup.inc:226
+msgid "Wake"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Path to directory that contains windows drivers for this printer"
+#: admin/ogroups/goto/class_termgroup.inc:227
+msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Driver name"
+#: admin/ogroups/goto/class_termgroup.inc:228
+msgid "Memory test"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Windows name of the printer driver"
+#: admin/ogroups/goto/class_termgroup.inc:229
+msgid "System analysis"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
+#: admin/ogroups/goto/class_termgroup.inc:293
+#: admin/systems/class_networkSettings.inc:310
+msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
+#: admin/ogroups/goto/class_termgroup.inc:301
+msgid "System"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
+#: admin/ogroups/goto/class_termgroup.inc:302
+msgid "System group"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
+#: admin/ogroups/goto/class_termgroup.inc:308
+#: admin/ogroups/goto/termgroup.tpl.c:11
+msgid "Mode"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
+#: admin/ogroups/goto/class_termgroup.inc:309
+msgid "Action flag"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
+#: admin/ogroups/goto/class_termgroup.inc:310
+#: admin/systems/class_terminalStartup.inc:53
+#: admin/ogroups/goto/termgroup.tpl.c:17
+msgid "Root server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
+#: admin/ogroups/goto/class_termgroup.inc:311
+#: admin/systems/class_terminalStartup.inc:57
+#: admin/ogroups/goto/termgroup.tpl.c:23
+msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
-msgid "No DNS server found for zone %s"
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:326
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_networkSettings.inc:263
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:327
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
+#: admin/systems/class_networkSettings.inc:320
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:191
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:37
 msgid "Component information"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:41
+#: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/class_phoneGeneric.inc:56
+#: admin/systems/class_printGeneric.inc:58
+msgid "Properties"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr ""
+
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
 msgstr ""
@@ -624,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -636,6 +450,19 @@ msgstr ""
 msgid "A short description of the mobile phone"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The serial number of the mobile phone"
 msgstr ""
@@ -660,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -672,88 +504,170 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:50
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:30
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:103
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:128
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:150
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:167
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:172
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -778,69 +692,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -918,203 +832,286 @@ msgstr ""
 msgid "Filepath to tls ca certificate"
 msgstr ""
 
-#: admin/systems/services/ldap/class_serviceLDAP.inc:78
-msgid "TLS ReqCert"
+#: admin/systems/services/ldap/class_serviceLDAP.inc:78
+msgid "TLS ReqCert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:78
+msgid ""
+"Specifies what checks to perform on server certificates in a TLS session, if "
+"any"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:83
+msgid "TLS CrlCheck"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:83
+msgid ""
+"Specifies if the Certificate Revocation List (CRL) of the CA should be used "
+"to verify if the server certificates have  not  been  revoked"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+msgid "LDAP"
+msgstr ""
+
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
 msgstr ""
 
-#: admin/systems/services/ldap/class_serviceLDAP.inc:78
-msgid ""
-"Specifies what checks to perform on server certificates in a TLS session, if "
-"any"
+#: admin/systems/system-list.xml:209
+msgid "winStation"
 msgstr ""
 
-#: admin/systems/services/ldap/class_serviceLDAP.inc:83
-msgid "TLS CrlCheck"
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
 msgstr ""
 
-#: admin/systems/services/ldap/class_serviceLDAP.inc:83
-msgid ""
-"Specifies if the Certificate Revocation List (CRL) of the CA should be used "
-"to verify if the server certificates have  not  been  revoked"
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
 msgstr ""
 
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "LDAP"
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
-#, php-format
-msgid "IP address %s"
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
+msgid "Action canceled"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_systemManagement.inc:159
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_systemManagement.inc:173
+#, php-format
+msgid "System %s is currently installing"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
+msgid "Permission"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_systemManagement.inc:419
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_systemManagement.inc:482
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_systemManagement.inc:648
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_systemManagement.inc:700
+msgid "Systems Management"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1154,45 +1151,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be "
-"managed by it, so if you delete them or deactivate their OPSI tab, they will "
-"be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -1204,6 +1162,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be "
+"managed by it, so if you delete them or deactivate their OPSI tab, they will "
+"be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1240,30 +1205,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/es/fusiondirectory.po b/systems/locale/es/fusiondirectory.po
index 8bcafd481823cb8bb02ef01ea8f5669259a93c50..f867faa2d7b3ea9b4928b66a5bce174637fc14d3 100644
--- a/systems/locale/es/fusiondirectory.po
+++ b/systems/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Sistemas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Servidores"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr "Bloqueado"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr "Memoria de intercambio local"
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "heredado"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr "Análisis del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr "Marca de acción"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Servidor Raíz"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
@@ -319,8 +318,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr "Editar servicio"
 msgid "Remove service"
 msgstr "Eliminar servicio"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr "Dirección IP %s"
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "Dirección IP"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "Dirección MAC"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr "Dispositivo de Red"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Propiedades"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Inicio"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr "Inicio de terminal"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:50
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Inicio"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Inicio de terminal"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Método de conexión"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Servidor de terminal"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Error"
 
@@ -574,46 +602,46 @@ msgstr "¡No puedo actualizar el estado del servicio hasta que no se haya grabad
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "estación de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Localización"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr "Tipos de sesión soportadas"
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Recursos compartidos"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Pagina de códigos"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Opción"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Permisos"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr "Heredado de %s"
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr "terminal"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Método de conexión"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Ninguno"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Servidor de terminal"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/es_CO/fusiondirectory.po b/systems/locale/es_CO/fusiondirectory.po
index 3900b56755e4fed6ded9c53e99cb440b5a01a339..b9adef87403d99ebaca2e51cd1dd4aeb1beebafc 100644
--- a/systems/locale/es_CO/fusiondirectory.po
+++ b/systems/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Estadísticas e información general"
+msgid "Statistics and various information"
+msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
 msgid "DHCP"
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Propiedades"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Error"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Ubicación"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Precacuión"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Permisos"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Usted no tiene permitido crear un 'snashot' para %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Usted no está autorizado para restaurar un 'snapshot' para %s"
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Ninguno"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/es_VE/fusiondirectory.po b/systems/locale/es_VE/fusiondirectory.po
index 01197f351716ac4dd77c3c2f22c8a0e31c6bd4bd..8adc82c1cb142b81c2875f335cc3b0c5b92c74a2 100644
--- a/systems/locale/es_VE/fusiondirectory.po
+++ b/systems/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Sistemas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Servidor"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr "Bloqueado"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr "Memoria de intercambio local"
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "heredado"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr "Análisis del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr "Marca de acción"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Servidor Raíz"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
@@ -319,8 +318,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr "Editar servicio"
 msgid "Remove service"
 msgstr "Eliminar servicio"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr "Dirección IP %s"
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "Dirección IP"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "Dirección MAC"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr "Dispositivo de Red"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Propiedades"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Inicio"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr "Inicio de terminal"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:50
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Inicio"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Inicio de terminal"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Método de conexión"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Servidor de terminal"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Error"
 
@@ -574,46 +602,46 @@ msgstr "¡No puedo actualizar el estado del servicio hasta que no se haya grabad
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "estación de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Localización"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr "Tipos de sesión soportadas"
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Recursos compartidos"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Pagina de códigos"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Opción"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Permisos"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr "Heredado de %s"
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr "Administración de Sistemas"
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr "terminal"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Método de conexión"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Ninguno"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Servidor de terminal"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/fa_IR/fusiondirectory.po b/systems/locale/fa_IR/fusiondirectory.po
index 114c87d010d683d4da52a536d8140cf04ce71a0e..d56c8fbeb925c9db947ea94ea9ca10bf9df66277 100644
--- a/systems/locale/fa_IR/fusiondirectory.po
+++ b/systems/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "خطا"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "جواز"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/fi_FI/fusiondirectory.po b/systems/locale/fi_FI/fusiondirectory.po
index 160bc226d6228d8d8fb4b02302d9ef9827f6a2ec..3b4d390f46cd0c4f05611d44b278ab5bca1e17dd 100644
--- a/systems/locale/fi_FI/fusiondirectory.po
+++ b/systems/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Ominaisuudet"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Virhe"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Tyyppi"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Varoitus"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Lupa"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/fr/fusiondirectory.po b/systems/locale/fr/fusiondirectory.po
index 8cb1fd70587ec1727e78491375cdd6e32a23753c..27302c313b89735c152f2f8b2dee2df190140e84 100644
--- a/systems/locale/fr/fusiondirectory.po
+++ b/systems/locale/fr/fusiondirectory.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:07+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Réseau"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr "Statistiques et informations diverses"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -36,55 +36,54 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Systèmes"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr "Statistiques et informations sur les systèmes"
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr "Nom d'ordinateur à utiliser par unité"
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr "Stations de travail"
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Serveurs"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr "Stations de travail Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr "Terminaux"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr "Imprimantes"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr "Téléphones"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr "Composants"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr "Téléphones portables"
 
@@ -197,21 +196,21 @@ msgid "Locked"
 msgstr "Verrouillé"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr "Swap local"
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "hérité"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr "Service d’infrastructure"
 
@@ -257,7 +256,7 @@ msgid "System analysis"
 msgstr "Analyse du système"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -279,13 +278,13 @@ msgid "Action flag"
 msgstr "Indicateur d'action"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Serveur racine"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Serveur de swap"
@@ -321,8 +320,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -364,29 +363,29 @@ msgstr "Éditer le service"
 msgid "Remove service"
 msgstr "Supprimer le service"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr "Adresse IP %s"
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "Adresse IP"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "Adresse MAC"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -409,7 +408,7 @@ msgstr "Périphérique réseau"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -417,8 +416,8 @@ msgstr "Propriétés"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -506,37 +505,66 @@ msgstr "Numéro PUK"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Numéro PUK de la carte SIM du téléphone portable"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Démarrage"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr "Démarrage du terminal"
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Paramètres de démarrage"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Noyau de démarrage"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr "Le serveur racine que le terminal doit utiliser"
+
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
+msgstr "Le serveur de swap que le terminal doit utiliser"
+
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Bureau distant"
+
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Méthode de connexion"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Noyau Linux à installer et à démarrer"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Paramètres de démarrage du noyau"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Paramètres de démarrage à passer au noyau Linux"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Démarrage"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Démarrage du terminal"
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Serveur de terminaux"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -549,7 +577,7 @@ msgstr "Services serveur"
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Erreur"
 
@@ -576,46 +604,46 @@ msgstr "Impossible de mettre à jour le statut avant que cela soit sauvé !"
 msgid "Could not get execute action %s on service %s."
 msgstr "Impossible d'exécuter l'action %s sur le service %s."
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Station de travail"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr "Information de la station de travail"
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "station de travail"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr "Le nom de ce %s"
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr "Une courte description de ce %s"
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Lieu"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr "L'emplacement de ce %s"
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr "Verrouiller ce %s"
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Ceci empêchera ce %s d'être réinstallé"
@@ -665,69 +693,69 @@ msgstr "Type de sessions supportées"
 msgid "The session types supported by this terminal server"
 msgstr "Les types de sessions supportés par ce serveur de terminaux"
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr "Service de partage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Partages"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr "Partages fournis par ce serveur"
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr "Nom du partage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr "Description du partage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Type"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr "Type de partage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Encodage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr "Encodage utilisé pour ce partage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr "Chemin / Volume"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr "Chemin ou volume concerné par ce partage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Option"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr "Option(s) spéciale(s) pour ce partage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr "Vous devez configurer en premier l'encodage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Avertissement"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Valeur d'encodage invalide : %s"
@@ -926,44 +954,44 @@ msgstr "Numéro de série du téléphone"
 msgid "The telephone number of the phone"
 msgstr "Numéro de téléphone"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr "Action annulée"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, 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"
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr "Système %s est actuellement en cours d'installation"
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Permission"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à créer un nouvel instantané pour %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à restaurer un instantané de %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr "Hérité de %s"
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr "Gestion des systèmes"
 
@@ -1057,52 +1085,6 @@ msgstr "Information du terminal"
 msgid "terminal"
 msgstr "terminal"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Le serveur racine que le terminal doit utiliser"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "Le serveur de swap que le terminal doit utiliser"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Bureau distant"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Méthode de connexion"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Aucun"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Serveur de terminaux"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr "Il y a plusieurs serveurs Argonaut ! (ce n'est pas encore supporté)"
diff --git a/systems/locale/hu_HU/fusiondirectory.po b/systems/locale/hu_HU/fusiondirectory.po
index a65e040bc827d85ba582691fd9bf370f70adb674..3ee1aa58f0ba3e0fd4176ad7a63ebcff15b7e596 100644
--- a/systems/locale/hu_HU/fusiondirectory.po
+++ b/systems/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr ""
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr ""
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/id/fusiondirectory.po b/systems/locale/id/fusiondirectory.po
index c6ebf2640329b37370610935d132a2e38a5c2b52..14027e715333cd9a7b5e750fddc2e88eebd4885a 100644
--- a/systems/locale/id/fusiondirectory.po
+++ b/systems/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr ""
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr ""
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/it_IT/fusiondirectory.po b/systems/locale/it_IT/fusiondirectory.po
index fa2c158a0127fd9a99d18aeb7cf0eba288746617..455179a66809a00542ac5b49527eefabb36bc9b6 100644
--- a/systems/locale/it_IT/fusiondirectory.po
+++ b/systems/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 11:16+0000\n"
+"Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Rete"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr "Statistiche e informazioni varie"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -35,55 +35,54 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Sistemi"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr "Statistiche e informazioni sui sistemi"
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr "Nome del computer da usare per unità"
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr "Workstations"
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Servers"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr "Workstations Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr "Terminali"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr "Stampanti"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr "Telefoni"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr "Componenti"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr "Telefono cellulare"
 
@@ -196,21 +195,21 @@ msgid "Locked"
 msgstr "Bloccato"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr "Swap locale"
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "eredita"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr "Servizio d'infrastruttura"
 
@@ -256,7 +255,7 @@ msgid "System analysis"
 msgstr "Analisi del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
@@ -278,13 +277,13 @@ msgid "Action flag"
 msgstr "Indicatore d'azione"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Server principale"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Server di swap"
@@ -320,8 +319,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -363,29 +362,29 @@ msgstr "Modifica i servizi"
 msgid "Remove service"
 msgstr "Elimina il servizio"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr "Indirizzo IP %s"
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "Indirizzo IP"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "Indirizzo MAC"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -408,7 +407,7 @@ msgstr "Periferica di rete"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -416,8 +415,8 @@ msgstr "Proprietà"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -505,37 +504,66 @@ msgstr "Numero PUK"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Il numero PUK della carta sim di questo telefono cellulare"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Avvio"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr "Avvio del terminale"
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Parametri di avvio"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Kernel d'avvio"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr "Il server principale che il terminale dovrebbe usare"
+
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
+msgstr "La swap principale che il terminale dovrebbe usare"
+
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Desktop a distanza"
+
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Metodo di connessione"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Kernel linux che dovrà essere installato ed avviato"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Parametri del kernel d'avvio"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Parametri del kernel d'avvio da eseguire"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Avvio"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Avvio del terminale"
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Server terminale"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -548,7 +576,7 @@ msgstr "Servizi del server"
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Errore"
 
@@ -575,46 +603,46 @@ msgstr "Impossibile aggiornare lo stato del servizio prima che questo venga regi
 msgid "Could not get execute action %s on service %s."
 msgstr "Impossibile eseguire l'azione %s sul servizio %s "
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Workstation"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr "Informazione terminale"
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "workstation"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr "Il nome di %s"
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr "Una breve descrizione del %s"
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Località"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr "L'ubicazione di %s"
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr "Blocca questo %s"
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Questo eviterà che %s venga reinstallato"
@@ -664,69 +692,69 @@ msgstr "Tipi di sessione supportati"
 msgid "The session types supported by this terminal server"
 msgstr "Tipi di sessione supportati da questo server terminal"
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr "Servizio condiviso"
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Condivisioni"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr "Condivisioni che questo server ospita"
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr "Nome di questa condivisione"
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr "Descrizione di questa condivisione"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr "Tipo di condivisione"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Codice dei caratteri della pagina"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr "Codepage per questa condivisione"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr "Percorso / Volume"
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr "Percorso o volume interessato da questa condivisione"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Opzione"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr "Opzione speciale (i) per questo share"
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr "È necessario configurare prima le codifiche"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Valore non valido in codifiche : %s"
@@ -925,44 +953,44 @@ msgstr "Numero di serie del telefono"
 msgid "The telephone number of the phone"
 msgstr "Numero di telefono di questo telefono"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr "Azione annullata"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr "Il sistema %s non ha un indirizzo MAC definito, impossibile innescare l'azione"
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr "Il sistema %s é in corso d'installazione"
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Permessi"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr "Ereditato da %s"
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr "Gestione dei sistemi"
 
@@ -1056,52 +1084,6 @@ msgstr "Informazioni terminale"
 msgid "terminal"
 msgstr "terminale"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Il server principale che il terminale dovrebbe usare"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "La swap principale che il terminale dovrebbe usare"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Desktop a distanza"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Metodo di connessione"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Nessuno"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Server terminale"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr "Ci sono diversi server Argonaut! (questo non è ancora supportato)"
diff --git a/systems/locale/lv/fusiondirectory.po b/systems/locale/lv/fusiondirectory.po
index df257c81f48a861eda7bd94176a1e0561fe66544..b63266875c95773b5233f4045c3a5262b98c136f 100644
--- a/systems/locale/lv/fusiondirectory.po
+++ b/systems/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Kļūda"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Atrašanās vieta"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Veids"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Atļauja"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/nb/fusiondirectory.po b/systems/locale/nb/fusiondirectory.po
index 07c1c397cecd32c6a994ec864af39b4ebad2ef36..947f71cb8b4e8403e943a204617789dd2d19b25a 100644
--- a/systems/locale/nb/fusiondirectory.po
+++ b/systems/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Tjener"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Egenskaper"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Feil"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/nl/fusiondirectory.po b/systems/locale/nl/fusiondirectory.po
index 5270b62f4c5f7208283925624633fef0ab9d58f2..e8909bef8f6c72b3725e84a90cc54018e9524097 100644
--- a/systems/locale/nl/fusiondirectory.po
+++ b/systems/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Systemen"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Servers"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr "Geblokkeerd"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr "Lokale swap"
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "overerfd"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr "Systeem analyse"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr "Actie vlag"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Root server"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Swap server"
@@ -319,8 +318,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr "Bewerk dienst"
 msgid "Remove service"
 msgstr "Verwijder dienst"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr "IP adres %s"
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "IP adres"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "Hardware adres (MAC)"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr "Netwerk apparatuur"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Eigenschappen"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Opstarten"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr "Terminal startup"
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Opstart parameters"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Remote desktop"
+
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Verbindings methode"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Linux kernel om te installeren en te booten"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Linux kernel parameters om te draaien"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Opstarten"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Terminal server"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Fout"
 
@@ -574,46 +602,46 @@ msgstr "Kan dienst status niet update zolang het niet opgeslagen is!"
 msgid "Could not get execute action %s on service %s."
 msgstr "Kan geen actie %s niet uitvoeren op service %s."
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Workstation"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "workstation"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr "De naam van deze %s"
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr "Een korte beschrijving van de %s"
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Plaats"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr "De locatie van de %s"
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr "Blokkeer dit %s"
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr "Ondersteunde type sessies"
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Shares"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Type"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Karakterset"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Optie"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Recht"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Je hebt geen toelating om een snapshot te maken voor %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Je hebt geen toelating om een snapshot voor %s te restaureren."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr "Overgenomen van %s"
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr "Systeem Management"
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr "terminal"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Remote desktop"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Verbindings methode"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Geen"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Terminal server"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/pl/fusiondirectory.po b/systems/locale/pl/fusiondirectory.po
index 78189f0b7aa27e5ffd42677adf580e5afba41271..a1a157379d381bcc2d3ade2e7cb93d6699132d03 100644
--- a/systems/locale/pl/fusiondirectory.po
+++ b/systems/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Systemy"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Serwery"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr "Zablokowane"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "odziedziczony"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr "Analiza systemu"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr "Flaga akcji"
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Serwer NFS"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Serwer Swap"
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr "Edytuj usługę"
 msgid "Remove service"
 msgstr "Usuń usługę"
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "adres IP"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "Adres MAC"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr "UrzÄ…dzenia sieciowe"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Właściwości"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Startup"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Uruchamiane jÄ…dro"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Zdalny pulpit"
+
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Metoda połączenia"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Serwer terminali"
+
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Stacja robocza"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "Udziały"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Typ"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Strona kodowa"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Opcja"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Uprawnienie"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Zdalny pulpit"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Metoda połączenia"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Serwer terminali"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/pt/fusiondirectory.po b/systems/locale/pt/fusiondirectory.po
index f49986129300f3291d23407d34c6d883b78c0f99..4250a319baa79df5a574ad681ff7fe48cbd0b9c7 100644
--- a/systems/locale/pt/fusiondirectory.po
+++ b/systems/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Sistemas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Servidor"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Propriedades"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Início"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Início"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Erro"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Estação de trabalho"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Localização"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Atenção"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/pt_BR/fusiondirectory.po b/systems/locale/pt_BR/fusiondirectory.po
index 2b9ff58abd064397edb9b4b3aef525e8bebc4051..2f33815a09f907fc776b59e9d998db807fc992f6 100644
--- a/systems/locale/pt_BR/fusiondirectory.po
+++ b/systems/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr ""
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr ""
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Nenhum"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/ru/fusiondirectory.po b/systems/locale/ru/fusiondirectory.po
index 814870337c04e51fb6333b16f7203c1cb5a02d53..207b0f6d0e2533a3142b41bd9bb8f46b653f14f0 100644
--- a/systems/locale/ru/fusiondirectory.po
+++ b/systems/locale/ru/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -20,13 +20,13 @@ 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"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Сеть"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Статистика и различная информация"
+msgid "Statistics and various information"
+msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
 msgid "DHCP"
@@ -36,55 +36,54 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Системы"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr "Статистика"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr "Рабочие станции"
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Серверы"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr "Рабочие станции Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr "Терминалы"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr "Принтеры"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr "Телефоны"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr "Мобильные телефоны"
 
@@ -197,21 +196,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -257,7 +256,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
@@ -279,13 +278,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "Основной сервер"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "Сервер подкачки"
@@ -321,8 +320,8 @@ msgstr "!"
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -364,29 +363,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr "IP адрес"
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "MAC адрес"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -409,7 +408,7 @@ msgstr "Сетевое устройство"
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -417,8 +416,8 @@ msgstr "Свойства"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -506,37 +505,66 @@ msgstr "PUK номер"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "PUK номер сим карты в мобильном телефоне "
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Запуск"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Параметры запуска"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Ядро для загрузки"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Linux ядро, которое установлено и загружено"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Параметры загрузки ядра"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "Удаленная рабочая станция"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Параметры с которыми Linux ядро было запущено"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "Способ подключения"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Запуск"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr "LDM"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Оболочка"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "Терминал-сервер"
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -549,7 +577,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Ошибка"
 
@@ -576,46 +604,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Рабочая станция"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr "Информация об рабочей станции"
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr "рабочая станция"
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr "Название %s"
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr "Краткое описание %s"
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Местоположение"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr "Местоположение %s"
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -665,69 +693,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Тип"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "Кодовая страница"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "Опции"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -926,44 +954,44 @@ msgstr "Серийный номер телефона"
 msgid "The telephone number of the phone"
 msgstr "Телефонный номер у этого телефона"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Права"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Вам не разрешено создавать снапшот для %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Вам не разрешено восстанавливать снапшот для %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1057,52 +1085,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Удаленная рабочая станция"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Способ подключения"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Оболочка"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Терминал-сервер"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/ru@petr1708/fusiondirectory.po b/systems/locale/ru@petr1708/fusiondirectory.po
index 619451f5bbc1585761353092cdc8fed503fac2f1..6e87e6c219133ced2ea73924b48889641e8c8bc6 100644
--- a/systems/locale/ru@petr1708/fusiondirectory.po
+++ b/systems/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ 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"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr ""
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr ""
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/sv/fusiondirectory.po b/systems/locale/sv/fusiondirectory.po
index 2e3d6a2a432d92bc074d751793082b856eaca27d..8c9ba3e3358d51d65def0c13b5fea4ec306642d0 100644
--- a/systems/locale/sv/fusiondirectory.po
+++ b/systems/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "System"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Server"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Egenskaper"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Starta upp"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Uppstartsparametrar"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Bootkärna"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Linuxkärna att installera och starta upp"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Parametrar för Bootkärna"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Linux kärnparametrar att köra"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Starta upp"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Skal"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Fel"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Arbetsstation"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Plats"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Typ"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Varning"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Rättighet"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Du har inte tillåtelse att skapa en ögonblicksbild för %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Du är inte tillåten att återskapa en ögonblicksbild för %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Ingen"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Skal"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/ug/fusiondirectory.po b/systems/locale/ug/fusiondirectory.po
index 9c13472c16a83eb04c5d73051964d18dc8ae68f9..88e3d564a76c91c8acd92fb168e4cfc8523f3e81 100644
--- a/systems/locale/ug/fusiondirectory.po
+++ b/systems/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr ""
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr ""
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/vi_VN/fusiondirectory.po b/systems/locale/vi_VN/fusiondirectory.po
index 811d58fc5725dd2ec449cbb3e62287f24c2fbef3..44556f3f607111cadbee6c9b243a694307e668d0 100644
--- a/systems/locale/vi_VN/fusiondirectory.po
+++ b/systems/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "Các hệ thống"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "Máy chủ (server)"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr ""
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "Properties"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "Khởi động"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Khởi động"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
 msgstr ""
 
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "Máy trạm"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "Vị trí"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "Loại"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "Cho phép"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Bạn không được phép tạo ra snapshot cho %s."
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Bạn không được phép phục hồi một snapshot cho %s."
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr "Thiết bị cuối "
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/zh/fusiondirectory.po b/systems/locale/zh/fusiondirectory.po
index 300a225636ddf203b797cd6b834933e488652b2f..9e7a9f95a672537030accb4b8453ac1640bf3c2c 100644
--- a/systems/locale/zh/fusiondirectory.po
+++ b/systems/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:09+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:324
+#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+msgid "Statistics and various information"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
@@ -34,55 +34,54 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:31
+#: addons/dashboard/class_dashBoardSystems.inc:29
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
+#: admin/systems/class_systemManagement.inc:699
+#: admin/systems/class_systemManagement.inc:703
 msgid "Systems"
 msgstr "系统设置"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
+#: addons/dashboard/class_dashBoardSystems.inc:41
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
+#: addons/dashboard/class_dashBoardSystems.inc:46
 msgid "Computer name to use by unit"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
+#: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:77
-#: admin/systems/class_terminalGeneric.inc:62
+#: addons/dashboard/class_dashBoardSystems.inc:75
 msgid "Servers"
 msgstr "服务器"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
+#: addons/dashboard/class_dashBoardSystems.inc:78
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
+#: addons/dashboard/class_dashBoardSystems.inc:81
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
+#: addons/dashboard/class_dashBoardSystems.inc:87
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
+#: addons/dashboard/class_dashBoardSystems.inc:90
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
+#: addons/dashboard/class_dashBoardSystems.inc:93
 msgid "Mobile phones"
 msgstr ""
 
@@ -195,21 +194,21 @@ msgid "Locked"
 msgstr "锁定"
 
 #: admin/ogroups/goto/class_termgroup.inc:102
-#: admin/systems/class_terminalGeneric.inc:126
+#: admin/systems/class_terminalStartup.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:108
 #: admin/ogroups/goto/class_termgroup.inc:120
-#: admin/systems/class_terminalGeneric.inc:114
-#: admin/systems/class_terminalGeneric.inc:130
+#: admin/systems/class_terminalStartup.inc:112
+#: admin/systems/class_terminalStartup.inc:123
 msgid "inherited"
 msgstr "继承"
 
 #: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:275
-#: admin/systems/class_systemManagement.inc:182
-#: admin/systems/class_systemManagement.inc:206
+#: admin/systems/class_workstationGeneric.inc:284
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:213
 msgid "Infrastructure service"
 msgstr ""
 
@@ -255,7 +254,7 @@ msgid "System analysis"
 msgstr "系统分析"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:314
+#: admin/systems/class_networkSettings.inc:310
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
@@ -277,13 +276,13 @@ msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:310
-#: admin/systems/class_terminalGeneric.inc:66
+#: admin/systems/class_terminalStartup.inc:53
 #: admin/ogroups/goto/termgroup.tpl.c:17
 msgid "Root server"
 msgstr "根服务器"
 
 #: admin/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalGeneric.inc:72
+#: admin/systems/class_terminalStartup.inc:57
 #: admin/ogroups/goto/termgroup.tpl.c:23
 msgid "Swap server"
 msgstr "交换服务器"
@@ -319,8 +318,8 @@ msgstr ""
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/class_componentGeneric.inc:67
 #: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/class_workstationGeneric.inc:166
+#: admin/systems/services/shares/class_serviceShare.inc:55
 #: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
@@ -362,29 +361,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:242
+#: admin/systems/class_networkSettings.inc:240
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:248
+#: admin/systems/class_networkSettings.inc:254
 #: admin/systems/class_networkSettings.inc:256
-#: admin/systems/class_networkSettings.inc:258
-#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_networkSettings.inc:326
 #: admin/systems/class_printGeneric.inc:108
 msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_networkSettings.inc:263
 #: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:267
-#: admin/systems/class_networkSettings.inc:332
+#: admin/systems/class_networkSettings.inc:327
 msgid "MAC address"
 msgstr "MAC 地址"
 
-#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_networkSettings.inc:320
 #: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_workstationGeneric.inc:191
 #: admin/systems/class_phoneGeneric.inc:83
 #: admin/systems/class_printGeneric.inc:103
 msgid "Network settings"
@@ -407,7 +406,7 @@ msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
-#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_workstationGeneric.inc:157
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
@@ -415,8 +414,8 @@ msgstr "属性"
 
 #: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/services/shares/class_serviceShare.inc:51
 #: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
 #: admin/systems/system-filter.tpl.c:29
@@ -504,37 +503,66 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr "启动"
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "启动内核"
+#: admin/systems/class_terminalStartup.inc:53
+msgid "The root server the terminal should be using"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_terminalStartup.inc:57
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr "远程桌面"
+
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr "连接方法"
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "启动"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr "终端服务器"
+
 #: admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 #: admin/systems/system-list.xml:152
 msgid "Services"
@@ -547,7 +575,7 @@ msgstr ""
 #: admin/systems/class_serverService.inc:225
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "Error"
 msgstr "错误"
 
@@ -574,46 +602,46 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/class_workstationGeneric.inc:127
+#: admin/systems/class_workstationGeneric.inc:132
+#: admin/systems/class_workstationGeneric.inc:133
 #: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
 msgid "Workstation"
 msgstr "工作站"
 
-#: admin/systems/class_workstationGeneric.inc:119
+#: admin/systems/class_workstationGeneric.inc:128
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:141
+#: admin/systems/class_workstationGeneric.inc:150
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
+#: admin/systems/class_workstationGeneric.inc:161
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:158
+#: admin/systems/class_workstationGeneric.inc:167
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:163
+#: admin/systems/class_workstationGeneric.inc:172
 msgid "Location"
 msgstr "位置"
 
-#: admin/systems/class_workstationGeneric.inc:164
+#: admin/systems/class_workstationGeneric.inc:173
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
+#: admin/systems/class_workstationGeneric.inc:179
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
+#: admin/systems/class_workstationGeneric.inc:180
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
@@ -663,69 +691,69 @@ msgstr ""
 msgid "The session types supported by this terminal server"
 msgstr ""
 
+#: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:43
+#: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
 msgstr "共享"
 
-#: admin/systems/services/shares/class_serviceShare.inc:48
+#: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/services/shares/class_serviceShare.inc:51
 msgid "Name of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/services/shares/class_serviceShare.inc:55
 msgid "Description of this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
 msgstr "类型"
 
-#: admin/systems/services/shares/class_serviceShare.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage"
 msgstr "代码页"
 
-#: admin/systems/services/shares/class_serviceShare.inc:65
+#: admin/systems/services/shares/class_serviceShare.inc:64
 msgid "Codepage for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:69
+#: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
 msgstr "选项"
 
-#: admin/systems/services/shares/class_serviceShare.inc:73
+#: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:104
+#: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
 msgid "Warning"
 msgstr "警告"
 
-#: admin/systems/services/shares/class_serviceShare.inc:111
+#: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -924,44 +952,44 @@ msgstr ""
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:173
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:159
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_systemManagement.inc:173
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:249
+#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_systemManagement.inc:419
+#: admin/systems/class_systemManagement.inc:482
 msgid "Permission"
 msgstr "允许"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:419
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemManagement.inc:482
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemManagement.inc:648
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
+#: admin/systems/class_systemManagement.inc:700
 msgid "Systems Management"
 msgstr ""
 
@@ -1055,52 +1083,6 @@ msgstr ""
 msgid "terminal"
 msgstr "终端"
 
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "远程桌面"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "连接方法"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "终端服务器"
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/user-reminder/config/user-reminder/class_userReminderConfig.inc b/user-reminder/config/user-reminder/class_userReminderConfig.inc
index c5c293bcc82417188ba196919561edc2dff303ab..bca0560c1b204a34bb5993c7add166d76ba6f63e 100644
--- a/user-reminder/config/user-reminder/class_userReminderConfig.inc
+++ b/user-reminder/config/user-reminder/class_userReminderConfig.inc
@@ -29,7 +29,7 @@ class userReminderConfig extends simplePlugin
       'plDescription'   => _('Configuration for the reminder of accounts expiration'),
       'plObjectType'    => array('configuration'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -105,10 +105,24 @@ class userReminderConfig extends simplePlugin
             _('Body of the confirmation email, sent when the user has postponed expiration. Use %s for the cn and uid.'),
             'fdUserReminderConfirmationBody', FALSE,
             _('Dear %1$s,'."\n".' your account %2$s expiration has been successfully postponed.'."\n")
+          ),
+          new HiddenAttribute (
+            'fdReminderTokenRDN',
+            FALSE,
+            'ou=reminder'
           )
         )
       )
     );
   }
+
+  protected function post_save()
+  {
+    global $config;
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ldap->create_missing_trees(get_ou('reminderTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE']);
+    parent::post_save();
+  }
 }
 ?>
diff --git a/user-reminder/contrib/etc/fusiondirectory-user-reminder.conf b/user-reminder/contrib/etc/fusiondirectory-user-reminder.conf
deleted file mode 100644
index 95f2e6c2859fb5aa6e12de0045f4ba2acd9d1c02..0000000000000000000000000000000000000000
--- a/user-reminder/contrib/etc/fusiondirectory-user-reminder.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[ldap]
-config   = /etc/ldap/ldap.conf
-dn       = cn=admin,dc=fusiondirectory,dc=org
-password = secret
-tls      = off
-
-[fd]
-url      = https://localhost/fusiondirectory/
-
diff --git a/user-reminder/contrib/openldap/user-reminder-fd-conf.schema b/user-reminder/contrib/openldap/user-reminder-fd-conf.schema
index 18984d45d1f4ce47a2b1232f6e8b751a09af9e51..06206b0d6cb67e41b1bc6f3dbe8774d8e9ccbd1b 100644
--- a/user-reminder/contrib/openldap/user-reminder-fd-conf.schema
+++ b/user-reminder/contrib/openldap/user-reminder-fd-conf.schema
@@ -64,12 +64,20 @@ attributetype ( 1.3.6.1.4.1.38414.59.1.10 NAME 'fdUserReminderConfirmationBody'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
 
+
+attributetype ( 1.3.6.1.4.1.38414.59.1.11 NAME 'fdReminderTokenRDN'
+  DESC 'FusionDirectory - User Reminder Token RDN'
+  EQUALITY caseExactIA5Match
+  SUBSTR caseExactIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
 # Object Class
 
 objectclass ( 1.3.6.1.4.1.38414.59.2.1 NAME 'fdUserReminderPluginConf'
   DESC 'FusionDirectory user-reminder plugin configuration'
   SUP top AUXILIARY
-  MUST ( cn $ fdUserReminderAlertDelay $ fdUserReminderResendDelay $
+  MUST ( cn $ fdReminderTokenRDN $ fdUserReminderAlertDelay $ fdUserReminderResendDelay $
   fdUserReminderPostponeDays $ fdUserReminderForwardAlert $ fdUserReminderForwardConfirmation $
   fdUserReminderEmail $ fdUserReminderAlertSubject $ fdUserReminderAlertBody)
   MAY ( fdUserReminderConfirmationSubject $ fdUserReminderConfirmationBody ) )
diff --git a/user-reminder/html/class_expiredUserPostpone.inc b/user-reminder/html/class_expiredUserPostpone.inc
index a1ff7ad51992d3838cb0b40254d0db2686cb71e5..a6d1da2a7356c806067dc5196fe35d5523f4d905 100644
--- a/user-reminder/html/class_expiredUserPostpone.inc
+++ b/user-reminder/html/class_expiredUserPostpone.inc
@@ -102,7 +102,7 @@ class expiredUserPostpone extends standAlonePage
     /* Retrieve hash from the ldap */
     $ldap = $config->get_ldap_link();
 
-    $dn   = 'ou='.$this->uid.','.get_ou('tokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
+    $dn   = 'ou='.$this->uid.','.get_ou('reminderTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
     $ldap->cat($dn);
     if ($attrs = $ldap->fetch()) {
       $ldap_token = $attrs['userPassword'][0];
diff --git a/user-reminder/ihtml/themes/breezy/user-reminder.tpl b/user-reminder/ihtml/themes/breezy/user-reminder.tpl
index 14b0c857e1ccca1cbae959e97e50f053b857f828..da0ae6c28bc6048385f0c23402dab6136cfda4ba 100644
--- a/user-reminder/ihtml/themes/breezy/user-reminder.tpl
+++ b/user-reminder/ihtml/themes/breezy/user-reminder.tpl
@@ -5,11 +5,11 @@
     {include file={filePath file="setup_header.tpl"}}
   </div>
 
-  <div id="window_container">
+  <div id="window-container">
 
-    <div id="window_div">
+    <div id="window-div">
         {$msg_dialogs}
-        <div id="window_titlebar">
+        <div id="window-titlebar">
           <p>
             <img class="center" src="geticon.php?context=types&amp;icon=user&amp;size=48" alt="{t}User{/t}" title="{t}User{/t}"/>
             {t}Expiration postpone{/t}
diff --git a/user-reminder/locale/ar/fusiondirectory.po b/user-reminder/locale/ar/fusiondirectory.po
index 928b44249b790eb23ece784404c7e3bccfb66520..564f9de145458d6614c34238de9a541eeef98e26 100644
--- a/user-reminder/locale/ar/fusiondirectory.po
+++ b/user-reminder/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/user-reminder/locale/ca/fusiondirectory.po b/user-reminder/locale/ca/fusiondirectory.po
index c3304713e017c2e1860ba708e8e00f0ed7fa912f..fbb66cf55c638e4a0906026ccde7fee949f61ddd 100644
--- a/user-reminder/locale/ca/fusiondirectory.po
+++ b/user-reminder/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/user-reminder/locale/cs_CZ/fusiondirectory.po b/user-reminder/locale/cs_CZ/fusiondirectory.po
index 9ebdf3ee4b67578ad6c5bc6240964a6e88a18f7c..b3e268760066100a5be6ad3543b0404cb424afdd 100644
--- a/user-reminder/locale/cs_CZ/fusiondirectory.po
+++ b/user-reminder/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/user-reminder/locale/de/fusiondirectory.po b/user-reminder/locale/de/fusiondirectory.po
index 156cf47b9278532eeddfda476cb1b03b183ea421..d9e4d7dcd9984b9c7986be4a63e4478322f5102e 100644
--- a/user-reminder/locale/de/fusiondirectory.po
+++ b/user-reminder/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/user-reminder/locale/el_GR/fusiondirectory.po b/user-reminder/locale/el_GR/fusiondirectory.po
index 92a0c7a0c4aa31e07b163b5c33c925254a119793..1f5a592410248fd77cb9185a3a4c473431b1d081 100644
--- a/user-reminder/locale/el_GR/fusiondirectory.po
+++ b/user-reminder/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/user-reminder/locale/en/fusiondirectory.po b/user-reminder/locale/en/fusiondirectory.po
index 32bd8128ddbc8ab3cdd7d26e3f2e1da69c18ef01..024ac892b6bc0f938eed53d7f4a71ba67d354903 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/es/fusiondirectory.po b/user-reminder/locale/es/fusiondirectory.po
index 7c2da8ce80ae3baeb66bfc0a5189bc306ae2ec03..eedf5f3e9d6ff0d3df65b7547038fdfcdcf6954c 100644
--- a/user-reminder/locale/es/fusiondirectory.po
+++ b/user-reminder/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/user-reminder/locale/es_CO/fusiondirectory.po b/user-reminder/locale/es_CO/fusiondirectory.po
index 3d0eec8d0c45909faa13889ea10cfa6c9e247d5c..49fafbf2be20c4c6bf39538e61a1087f0cd099da 100644
--- a/user-reminder/locale/es_CO/fusiondirectory.po
+++ b/user-reminder/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/user-reminder/locale/es_VE/fusiondirectory.po b/user-reminder/locale/es_VE/fusiondirectory.po
index 5cf65feafd31cbb67d4f3e0c5f63c9a41037832c..d4af1fad1f4ff05c2f5f07e6a06081e4f9fbf268 100644
--- a/user-reminder/locale/es_VE/fusiondirectory.po
+++ b/user-reminder/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/user-reminder/locale/fa_IR/fusiondirectory.po b/user-reminder/locale/fa_IR/fusiondirectory.po
index 16c7f8d7155babade214dbd20aab11e870e8fc1a..fce8568164d265c445d95b983475e72154ba3ec8 100644
--- a/user-reminder/locale/fa_IR/fusiondirectory.po
+++ b/user-reminder/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/user-reminder/locale/fi_FI/fusiondirectory.po b/user-reminder/locale/fi_FI/fusiondirectory.po
index 411166f07bb5606cf76ac4e53efebd7f01d055f8..f1cbb31e57d8adcd9d6f09b35b97d18c10ad804e 100644
--- a/user-reminder/locale/fi_FI/fusiondirectory.po
+++ b/user-reminder/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/user-reminder/locale/fr/fusiondirectory.po b/user-reminder/locale/fr/fusiondirectory.po
index e0a55f63bef8af5bee7959e93355f589efa9d2dd..14f04c2eff0088681fd5c5642ef8b0a42df8971d 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-10 08:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/user-reminder/locale/hu_HU/fusiondirectory.po b/user-reminder/locale/hu_HU/fusiondirectory.po
index e0a1a10b2d6983aa171564ec14e93909fef3de9f..988e2143f7eb0d66bfc35c394fc2eff3f92cbf93 100644
--- a/user-reminder/locale/hu_HU/fusiondirectory.po
+++ b/user-reminder/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/user-reminder/locale/id/fusiondirectory.po b/user-reminder/locale/id/fusiondirectory.po
index 8c40a7658a4ca1ea27211e42036c799961c82fbd..54c0287201f777aa200673e6503e4de3436e8ce5 100644
--- a/user-reminder/locale/id/fusiondirectory.po
+++ b/user-reminder/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/user-reminder/locale/it_IT/fusiondirectory.po b/user-reminder/locale/it_IT/fusiondirectory.po
index e44ad2f96f07c3eb9127eedc4933cbda682eff2e..81f227302aec0c47b0d846281572aaef1f738a73 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 14:39+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/user-reminder/locale/lv/fusiondirectory.po b/user-reminder/locale/lv/fusiondirectory.po
index 1eb7fe4aafa225e12b1b7dedacf3f8f1c74e57f7..398c533b497ccc63c61809b737153f7de19d0255 100644
--- a/user-reminder/locale/lv/fusiondirectory.po
+++ b/user-reminder/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/user-reminder/locale/nb/fusiondirectory.po b/user-reminder/locale/nb/fusiondirectory.po
index 47c24d2c77cad62392c1a30f0c579532c77c4402..80c36214440b268520a36a81ce8d5530c165fd39 100644
--- a/user-reminder/locale/nb/fusiondirectory.po
+++ b/user-reminder/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/user-reminder/locale/nl/fusiondirectory.po b/user-reminder/locale/nl/fusiondirectory.po
index b7d980eeeeadc14ee0fa59122009e01f592f8054..bfddc6d5189f3067989954f3633c5ba82c68e229 100644
--- a/user-reminder/locale/nl/fusiondirectory.po
+++ b/user-reminder/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/user-reminder/locale/pl/fusiondirectory.po b/user-reminder/locale/pl/fusiondirectory.po
index f6f160641f1013f45b63a7ae3874897e899a5b39..18051bf2ae6f7e5f47ecd1d13487df724aa1e87f 100644
--- a/user-reminder/locale/pl/fusiondirectory.po
+++ b/user-reminder/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/user-reminder/locale/pt/fusiondirectory.po b/user-reminder/locale/pt/fusiondirectory.po
index bae3437e1c69714b62fc384b4fc062508624bad3..d9f8aadbcc3f135446e6961ad0647e1fa658f5ce 100644
--- a/user-reminder/locale/pt/fusiondirectory.po
+++ b/user-reminder/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/user-reminder/locale/pt_BR/fusiondirectory.po b/user-reminder/locale/pt_BR/fusiondirectory.po
index acc1dfb46ab12a09c6f32d2ea5f38efdaf39735f..5f0109d41eb339560898cdffdf88294000608037 100644
--- a/user-reminder/locale/pt_BR/fusiondirectory.po
+++ b/user-reminder/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/user-reminder/locale/ru/fusiondirectory.po b/user-reminder/locale/ru/fusiondirectory.po
index 472aad72e4ec6e1a6bb1b3f986e93921e1b3fc05..826cfd4f63b18358013ff0eb34c7b4c39210fcca 100644
--- a/user-reminder/locale/ru/fusiondirectory.po
+++ b/user-reminder/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-08-12 05:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/user-reminder/locale/ru@petr1708/fusiondirectory.po b/user-reminder/locale/ru@petr1708/fusiondirectory.po
index ebfdf1a3896f66cd2821408870ab44ca38fa9027..b624cd4a1cc2eef93fc063b883d16d1951d1c920 100644
--- a/user-reminder/locale/ru@petr1708/fusiondirectory.po
+++ b/user-reminder/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/user-reminder/locale/sv/fusiondirectory.po b/user-reminder/locale/sv/fusiondirectory.po
index d8fab6d052c11cbb56018a1632396525cbc8167c..29e953285afc014df2776e4408614717819f1a5c 100644
--- a/user-reminder/locale/sv/fusiondirectory.po
+++ b/user-reminder/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/user-reminder/locale/ug/fusiondirectory.po b/user-reminder/locale/ug/fusiondirectory.po
index 80e23ffb6cabb444a0cc8c7ccdabccc9ae7a4fb1..2bd57d119332bc67a41106d8723170bd2fe9aaae 100644
--- a/user-reminder/locale/ug/fusiondirectory.po
+++ b/user-reminder/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/user-reminder/locale/vi_VN/fusiondirectory.po b/user-reminder/locale/vi_VN/fusiondirectory.po
index 61224966b0988af46e0429b577ea5988f49e2efc..e0cd23ba7ab25cd8845d0dfec6602c29ad0e8b63 100644
--- a/user-reminder/locale/vi_VN/fusiondirectory.po
+++ b/user-reminder/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/user-reminder/locale/zh/fusiondirectory.po b/user-reminder/locale/zh/fusiondirectory.po
index aeef83c2ebc440991299947ead6626d3c61d2906..1ae558d74805bb26d958bbc3e831b0588c1aea98 100644
--- a/user-reminder/locale/zh/fusiondirectory.po
+++ b/user-reminder/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/weblink/admin/systems/weblink/class_webLink.inc b/weblink/admin/systems/weblink/class_webLink.inc
index a4121ace480e93970ee93b6adb3b67389b115176..d188463c34189e40d4ff421006c7dba3fbdf5485 100644
--- a/weblink/admin/systems/weblink/class_webLink.inc
+++ b/weblink/admin/systems/weblink/class_webLink.inc
@@ -33,7 +33,7 @@ class webLink extends simplePlugin
       'plSelfModify'    => FALSE,
       'plObjectType'    => array('workstation','server','ipmi','component','printer'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/weblink/locale/ar/fusiondirectory.po b/weblink/locale/ar/fusiondirectory.po
index c8dfc732e024f35b7750f6e72048a88fe0d14175..e8c28245a1d874b5f37391cff337de0be15eb71c 100644
--- a/weblink/locale/ar/fusiondirectory.po
+++ b/weblink/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/weblink/locale/ca/fusiondirectory.po b/weblink/locale/ca/fusiondirectory.po
index 284469ff360e9b4c2d777e18a6acb71db3a7ac49..63d02a9af7253ed276b50b33414fb86fe2d00806 100644
--- a/weblink/locale/ca/fusiondirectory.po
+++ b/weblink/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/weblink/locale/cs_CZ/fusiondirectory.po b/weblink/locale/cs_CZ/fusiondirectory.po
index 64e36dc879dcb9cd76c129b7155160da912ce637..bc8e5c9a2da9a7bd6943a2ab99978e247bcaeef6 100644
--- a/weblink/locale/cs_CZ/fusiondirectory.po
+++ b/weblink/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/weblink/locale/de/fusiondirectory.po b/weblink/locale/de/fusiondirectory.po
index 0dca247eb70c77c69bb8629c706bf49e84c03d8b..c4381654ed0c75bd96b02635df7c998507033fbe 100644
--- a/weblink/locale/de/fusiondirectory.po
+++ b/weblink/locale/de/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/weblink/locale/el_GR/fusiondirectory.po b/weblink/locale/el_GR/fusiondirectory.po
index 2f622df291d7c6aa2829715fbf7f580f804b0293..80e80d87c93fb6c131d406d2c65fa4f49b9abbea 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/weblink/locale/en/fusiondirectory.po b/weblink/locale/en/fusiondirectory.po
index b04cec1336d0a3e8dd570b76797a41d2c4eb1fce..3c1b6ba65f6bd8715237ffe814c6968069f7a9fe 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\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 c9ffd2746e2a6c88eebf63b9481a96799009778b..6c5b71cb1faa616e88e8af008c28bba03c20201c 100644
--- a/weblink/locale/es/fusiondirectory.po
+++ b/weblink/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/weblink/locale/es_CO/fusiondirectory.po b/weblink/locale/es_CO/fusiondirectory.po
index 51c827e44b1f15e9598f6539b0aa6ac363f10298..01868a9924749bf9a496ec4cff082d8e72277bbc 100644
--- a/weblink/locale/es_CO/fusiondirectory.po
+++ b/weblink/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/weblink/locale/es_VE/fusiondirectory.po b/weblink/locale/es_VE/fusiondirectory.po
index 03523b0c1e11ca1878fee63c84963fd86f5c7e8e..6ad6aec698699792e514b64a8a48c00d13e322f0 100644
--- a/weblink/locale/es_VE/fusiondirectory.po
+++ b/weblink/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/weblink/locale/fa_IR/fusiondirectory.po b/weblink/locale/fa_IR/fusiondirectory.po
index c1e794a150df79ab57c429144ca10b7614a69dd1..1accc1f05fdd4ef376b30412a6b4b71ebc045663 100644
--- a/weblink/locale/fa_IR/fusiondirectory.po
+++ b/weblink/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/weblink/locale/fi_FI/fusiondirectory.po b/weblink/locale/fi_FI/fusiondirectory.po
index 34c768cd4b82c08e18e3475bf20a1209d1cca5ea..ce43c71a76a17b7d9afb85e9fc1658ad91d0fa66 100644
--- a/weblink/locale/fi_FI/fusiondirectory.po
+++ b/weblink/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/weblink/locale/fr/fusiondirectory.po b/weblink/locale/fr/fusiondirectory.po
index 6f6019eecd0f02c2ef6a9a0d9a37db18e3545253..55b9698390ce4f786fb4934bad6eb2f832d7022a 100644
--- a/weblink/locale/fr/fusiondirectory.po
+++ b/weblink/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/weblink/locale/hu_HU/fusiondirectory.po b/weblink/locale/hu_HU/fusiondirectory.po
index 2890ed9cc691058a676c4716813fb65adccb4a79..8ed369d060f212b8a778483c048b229771aa9c7c 100644
--- a/weblink/locale/hu_HU/fusiondirectory.po
+++ b/weblink/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/weblink/locale/id/fusiondirectory.po b/weblink/locale/id/fusiondirectory.po
index 2b3af30b6fb23a4c97a02c9ef06b87b47b751367..88ad6b219d2e464d1e435f01b4bd7e4c04a98add 100644
--- a/weblink/locale/id/fusiondirectory.po
+++ b/weblink/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/weblink/locale/it_IT/fusiondirectory.po b/weblink/locale/it_IT/fusiondirectory.po
index 852bed60c4f932c3ffedcd040fd2115e736a9526..cd5658872494436c3ad903240372aafa52a7dfad 100644
--- a/weblink/locale/it_IT/fusiondirectory.po
+++ b/weblink/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-09-02 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/weblink/locale/lv/fusiondirectory.po b/weblink/locale/lv/fusiondirectory.po
index 80f3f4d4452b29279dca0c8bd48fe969a3a78755..3ddcc6b8eddd8dca46cee44ff8010c853a1fafc9 100644
--- a/weblink/locale/lv/fusiondirectory.po
+++ b/weblink/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/weblink/locale/nb/fusiondirectory.po b/weblink/locale/nb/fusiondirectory.po
index affbe0c0200fe4885e7997c5a156b9d938b04654..580456ab9b21e824e619ae29532da98ba7f5c969 100644
--- a/weblink/locale/nb/fusiondirectory.po
+++ b/weblink/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/weblink/locale/nl/fusiondirectory.po b/weblink/locale/nl/fusiondirectory.po
index ccce28de333672c4eda1c58556999ba6aa7c3166..802a96281a8cc7ba7d1c30af9630d99314bbdb02 100644
--- a/weblink/locale/nl/fusiondirectory.po
+++ b/weblink/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/weblink/locale/pl/fusiondirectory.po b/weblink/locale/pl/fusiondirectory.po
index 48cfb95636704f5c7253fbd59b858f913637ddb0..6571f4141115c9b01cfcbf92630809a8f49e74e2 100644
--- a/weblink/locale/pl/fusiondirectory.po
+++ b/weblink/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/weblink/locale/pt/fusiondirectory.po b/weblink/locale/pt/fusiondirectory.po
index 0a5df10ae8dcd79e36b73d9a8f7b6e2c347b6f70..17fd2b3b2b6d5b2abedb332dc21014b0373c001a 100644
--- a/weblink/locale/pt/fusiondirectory.po
+++ b/weblink/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/weblink/locale/pt_BR/fusiondirectory.po b/weblink/locale/pt_BR/fusiondirectory.po
index e4277d9d1742341f654345513dc70539285229ec..0ce3d87fdfcc3c7475066ab3bb8ddd9c876933a1 100644
--- a/weblink/locale/pt_BR/fusiondirectory.po
+++ b/weblink/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/weblink/locale/ru/fusiondirectory.po b/weblink/locale/ru/fusiondirectory.po
index decbb5187f723027c1399b2f0b48651dd30c7062..7f3c6613aebcf2127c24fd7b37854d07f64bb86b 100644
--- a/weblink/locale/ru/fusiondirectory.po
+++ b/weblink/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/weblink/locale/ru@petr1708/fusiondirectory.po b/weblink/locale/ru@petr1708/fusiondirectory.po
index db26610f4f2c9f6306e800308cdb151833a12d85..8a1499098dadf26d5d918bf7be98f37bf613c04f 100644
--- a/weblink/locale/ru@petr1708/fusiondirectory.po
+++ b/weblink/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/weblink/locale/sv/fusiondirectory.po b/weblink/locale/sv/fusiondirectory.po
index d8990bff817b6efb23bb51cdb41772bc77840e8d..0592912658b8650865c9f9cbc4e21b784ee9a8fb 100644
--- a/weblink/locale/sv/fusiondirectory.po
+++ b/weblink/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/weblink/locale/ug/fusiondirectory.po b/weblink/locale/ug/fusiondirectory.po
index da9460ae5420eea377aba99ea95358e0a8bebf37..295919472850b7c95ce44bbf121b8fb2a2083057 100644
--- a/weblink/locale/ug/fusiondirectory.po
+++ b/weblink/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/weblink/locale/vi_VN/fusiondirectory.po b/weblink/locale/vi_VN/fusiondirectory.po
index 234e96cb48954d7de6fb1ba34a9626657e107e0b..e3f76c616a6a01bc724316623e667c18175e09b9 100644
--- a/weblink/locale/vi_VN/fusiondirectory.po
+++ b/weblink/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/weblink/locale/zh/fusiondirectory.po b/weblink/locale/zh/fusiondirectory.po
index a4d7cd08e088fa579d1758b957cac9dfdce3e78d..0e48fd0be9ec5e74cef2db07de9e25dbd7e7cf7d 100644
--- a/weblink/locale/zh/fusiondirectory.po
+++ b/weblink/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/webservice/config/class_webserviceConfig.inc b/webservice/config/class_webserviceConfig.inc
index db25ccae7f9a65be69d93e9b4b5d9f069a0fb157..5ba99c75268a44734abad045f5e6366fc0242fea 100644
--- a/webservice/config/class_webserviceConfig.inc
+++ b/webservice/config/class_webserviceConfig.inc
@@ -31,7 +31,7 @@ class webserviceConfig extends simplePlugin
       'plCategory'      => array('configuration'),
       'plObjectType'    => array('smallConfig'),
 
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
diff --git a/webservice/contrib/bin/fusiondirectory-shell b/webservice/contrib/bin/fusiondirectory-shell
index 98780c1b2568ba2cdc4911a7ee7e446942700646..3a6c97fcb7ba33b09a4f0e4a9c2fa49445846677 100755
--- a/webservice/contrib/bin/fusiondirectory-shell
+++ b/webservice/contrib/bin/fusiondirectory-shell
@@ -177,7 +177,7 @@ my $term = new Term::ShellUI(
       proc    => \&command_lstabs,
     },
     "infos" => {
-      desc    => "Show informations about a type",
+      desc    => "Show information about a type",
       doc     => "Usage: infos <TYPE>\nExample: infos user\n",
       minargs => 1,
       maxargs => 1,
@@ -378,8 +378,32 @@ sub show_field
 sub ask_field
 {
   my ($field) = @_;
+  if (!($field->{'visible'})) {
+    return $field->{'value'};
+  }
+  if ($field->{'disabled'}) {
+    print $field->{'label'}.": ".$field->{'value'}."\n";
+    return $field->{'value'};
+  }
   foreach my $type (@{$field->{'type'}}) {
-    if (grep {$type eq $_} ('StringAttribute', 'IntAttribute')) {
+    if ($type eq 'CompositeAttribute') {
+      my $attributeshash = $field->{'attributes'};
+      my @values = ();
+      foreach my $key ( @{$field->{'attributes_order'}} ) {
+        my $attribute = $attributeshash->{$key};
+        push @values, ask_field($attribute);
+      }
+      return \@values;
+    } elsif ($type eq 'SetAttribute') {
+      print $field->{'label'}." (multiple values, empty line to finish):\n";
+      my @values = ();
+      my $value = $term->{term}->readline("");
+      while ($value ne '') {
+        push @values, $value;
+        $value = $term->{term}->readline("");
+      };
+      return \@values;
+    } elsif (grep {$type eq $_} ('StringAttribute', 'IntAttribute')) {
       return $term->{term}->readline($field->{'label'}.": ");
     } elsif ($type eq 'SelectAttribute') {
       print $field->{'label'}.":\n";
@@ -460,7 +484,13 @@ sub command_addtab
 {
   my ($type, $dn, $tab, @tabs) = @_;
   $dn = complete_dn($dn);
-  my $fields = rpc_call($client, 'formfields', [$sid,$type,$dn,$tab]);
+  if (not defined $tab) {
+    my $infos = rpc_call($client, 'infos', [$sid, $type]);
+    # Get the first tab
+    my ($tabobject) = @{$infos->{'tabs'}};
+    $tab = $tabobject->{'CLASS'};
+  }
+  my $fields = rpc_call($client, 'getfields', [$sid,$type,$dn,$tab]);
   my %values = ();
   if (ref $fields eq ref {}) {
     my $sectionhash = $fields->{'sections'};
@@ -478,7 +508,7 @@ sub command_addtab
       }
     }
   }
-  my $result = rpc_call($client, 'formpost', [$sid,$type,$dn,$tab,\%values]);
+  my $result = rpc_call($client, 'setfields', [$sid,$type,$dn,{$tab => \%values}]);
   if (ref $result eq ref {}) {
     foreach my $error (@{$result->{'errors'}}) {
       print "Error: $error\n";
diff --git a/webservice/contrib/docs/jsonrpc.php.doc b/webservice/contrib/docs/jsonrpc.php.doc
index 3f3180fea758e76680dfc8318349c1abc4f60d6e..49793094e078d85cbac4575b75bc53e6d79bd5e0 100644
--- a/webservice/contrib/docs/jsonrpc.php.doc
+++ b/webservice/contrib/docs/jsonrpc.php.doc
@@ -89,7 +89,7 @@ class fdRPCService
    * \param string  $sid the session id
    * \param string  $type the object type
    *
-   * \return The informations on this type as an associative array
+   * \return The information on this type as an associative array
    */
   function infos($sid, $type)
   {
@@ -225,6 +225,45 @@ class fdRPCService
   {
   }
 
+  /*!
+   * \brief Test if a user is locked
+   *
+   * \param string  $sid  the session id
+   * \param string  $dns  an array of user dns to test if they are locked, or a single dn of a user to test
+   *
+   * \return an associative array of booleans, the keys are the dns of the users
+   */
+  function isUserLocked($sid, $dns)
+  {
+  }
+
+  /*!
+   * \brief Generate recovery token for a user
+   *
+   * \param string  $sid    the session id
+   * \param string  $email  an email address associated to the user
+   *
+   * \return an associative array with keys "token" and "uid" upon success
+   */
+  function recoveryGenToken($sid, $email)
+  {
+  }
+
+  /*!
+   * \brief Change a user password using a recovery token
+   *
+   * \param string  $sid        the session id
+   * \param string  $uid        the uid of the user
+   * \param string  $password1  the password entered by the user
+   * \param string  $password2  the repeated password entered by the user
+   * \param string  $token      the recovery token
+   *
+   * \return TRUE upon success
+   */
+  function recoveryConfirmPasswordChange($sid, $uid, $password1, $password2, $token)
+  {
+  }
+
   /*!
    * \brief Get the session ID
    *
diff --git a/webservice/html/jsonrpc.php b/webservice/html/jsonrpc.php
index c13ee9e48c4c593ef7df3a82bec8f631c4186661..1bf829bd4a566db21ddf652586b6b7f65d9f6164 100644
--- a/webservice/html/jsonrpc.php
+++ b/webservice/html/jsonrpc.php
@@ -49,7 +49,7 @@ function initiateRPCSession($id = NULL, $ldap = NULL, $user = NULL, $pwd = NULL)
   reset_errors();
   /* Check if CONFIG_FILE is accessible */
   if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)) {
-    throw new Exception(sprintf(_("FusionDirectory configuration %s/%s is not readable. Aborted."), CONFIG_DIR, CONFIG_FILE));
+    throw new FusionDirectoryException(sprintf(_("FusionDirectory configuration %s/%s is not readable. Aborted."), CONFIG_DIR, CONFIG_FILE));
   }
 
   /* Initially load all classes */
@@ -59,7 +59,7 @@ function initiateRPCSession($id = NULL, $ldap = NULL, $user = NULL, $pwd = NULL)
       if (is_readable("$BASE_DIR/$path")) {
         require_once("$BASE_DIR/$path");
       } else {
-        throw new Exception(sprintf(_("Cannot locate file '%s' - please run '%s' to fix this"),
+        throw new FusionDirectoryException(sprintf(_("Cannot locate file '%s' - please run '%s' to fix this"),
               "$BASE_DIR/$path", "<b>fusiondirectory-setup</b>"));
       }
     }
@@ -83,7 +83,7 @@ function initiateRPCSession($id = NULL, $ldap = NULL, $user = NULL, $pwd = NULL)
     if (($ssl != "") &&
           (($config->get_cfg_value('webserviceForceSSL', 'TRUE') == 'TRUE') ||
            ($config->get_cfg_value('forcessl') == 'TRUE'))) {
-      throw new Exception("HTTP connexions are not allowed, please use HTTPS: $ssl\n");
+      throw new FusionDirectoryException("HTTP connexions are not allowed, please use HTTPS: $ssl\n");
     }
 
     if (!isset($_SERVER['PHP_AUTH_USER']) && ($user === NULL)) {
@@ -125,7 +125,7 @@ class fdRPCService
   {
     global $config;
     if (preg_match('/^_(.*)$/', $method, $m)) {
-      throw new Exception("Non existing method '$m[1]'");
+      throw new FusionDirectoryException("Non existing method '$m[1]'");
     }
 
     if ($method == 'listLdaps') {
@@ -145,7 +145,7 @@ class fdRPCService
 
     $this->ldap = $config->get_ldap_link();
     if (!$this->ldap->success()) {
-      throw new Exception('Ldap error: '.$this->ldap->get_error());
+      throw new FusionDirectoryException('Ldap error: '.$this->ldap->get_error());
     }
     $this->ldap->cd($config->current['BASE']);
 
@@ -165,7 +165,7 @@ class fdRPCService
       $self = '';
     }
     if (!$plist->check_access($infos['aclCategory'].$self)) {
-      throw new Exception("Unsufficient rights for accessing type '$type$self'");
+      throw new FusionDirectoryException("Unsufficient rights for accessing type '$type$self'");
     }
     if ($tabs !== NULL) {
       if (!is_array($tabs)) {
@@ -174,7 +174,7 @@ class fdRPCService
       foreach ($tabs as $tab) {
         $pInfos = pluglist::pluginInfos($tab);
         if (!$plist->check_access(join($self.',', $pInfos['plCategory']).$self)) {
-          throw new Exception("Unsufficient rights for accessing tab '$tab' of type '$type$self'");
+          throw new FusionDirectoryException("Unsufficient rights for accessing tab '$tab' of type '$type$self'");
         }
       }
     }
@@ -523,7 +523,7 @@ class fdRPCService
       }
     }
     if (count($disallowed)) {
-      return array('errors' => array(msgPool::permDelete($disallowed)));
+      return array('errors' => array(msgPool::permModify($disallowed)));
     }
 
     // Try to lock/unlock the entries.
@@ -539,7 +539,7 @@ class fdRPCService
           continue;
         }
         // Detect the password method and try to lock/unlock.
-        $method   = passwordMethod::get_method($val['userPassword'][0], $dn);
+        $method = passwordMethod::get_method($val['userPassword'][0], $dn);
         if ($method instanceOf passwordMethod) {
           $success = TRUE;
           if ($type == 'toggle') {
@@ -575,6 +575,97 @@ class fdRPCService
     }
   }
 
+  /*!
+   * \brief Test if a user is locked
+   */
+  protected function _isUserLocked($dns)
+  {
+    global $config, $ui;
+
+    if(!is_array($dns)) {
+      $dns = array($dns);
+    }
+
+    foreach ($dns as $dn) {
+      if (!preg_match('/r/', $ui->get_permissions($dn, 'user/password'))) {
+        $disallowed[] = $dn;
+      }
+    }
+    if (count($disallowed)) {
+      return array('errors' => array(msgPool::permView($disallowed)));
+    }
+
+    // Try to lock/unlock the entries.
+    $ldap   = $config->get_ldap_link();
+    $result = array();
+    $errors = array();
+    foreach ($dns as $dn) {
+      $ldap->cat($dn, array('userPassword'));
+      if ($ldap->count() == 1) {
+        // We can't lock empty passwords.
+        $val = $ldap->fetch();
+        if (!isset($val['userPassword'])) {
+          $errors[] = sprintf(_('Failed to get password method for account "%s"'), $dn);
+          continue;
+        }
+        // Detect the password method and try to lock/unlock.
+        $method = passwordMethod::get_method($val['userPassword'][0], $dn);
+        if ($method instanceOf passwordMethod) {
+          $result[$dn] = $method->is_locked($dn);
+        } else {
+          // Can't lock unknown methods.
+          $errors[] = sprintf(_('Failed to get password method for account "%s"'), $dn);
+        }
+      } else {
+        $errors[] = sprintf(_('Could not find account "%s" in LDAP'), $dn);
+      }
+    }
+    if (!empty($errors)) {
+      return array('errors' => $errors);
+    }
+    return $result;
+  }
+
+  /*!
+   * \brief Generate recovery token for a user
+   */
+  protected function _recoveryGenToken($email)
+  {
+    global $ui;
+
+    $pwRecovery = new passwordRecovery(FALSE);
+    $pwRecovery->email_address = $email;
+    $dn = $pwRecovery->step2();
+    if ($pwRecovery->step == 2) { /* No errors */
+      if (!preg_match('/w/', $ui->get_permissions($dn, 'user/password'))) {
+        return array('errors' => array(msgPool::permModify($dn)));
+      }
+      $token = $pwRecovery->generateAndStoreToken();
+      if (empty($pwRecovery->message) && ($token !== FALSE)) {
+        return array('token' => $token, 'uid' => $pwRecovery->uid);
+      }
+    }
+    return array('errors' => $pwRecovery->message);
+  }
+
+  /*!
+   * \brief Change a user password using a recovery token
+   */
+  protected function _recoveryConfirmPasswordChange($uid, $password1, $password2, $token)
+  {
+    $pwRecovery = new passwordRecovery(FALSE);
+    $pwRecovery->uid = $uid;
+    if ($pwRecovery->checkToken($token)) {
+      $success = $pwRecovery->changeUserPassword($password1, $password2);
+      if ($success) {
+        return TRUE;
+      }
+    } else {
+      $pwRecovery->message[] = _('This token is invalid');
+    }
+    return array('errors' => $pwRecovery->message);
+  }
+
   /*!
    * \brief Get the session ID
    */
diff --git a/webservice/locale/ar/fusiondirectory.po b/webservice/locale/ar/fusiondirectory.po
index be1f606fae6bb7e5c1bea7d477edddab30372a43..a2de91941205118475d49e3db1e55b0c85ab29c0 100644
--- a/webservice/locale/ar/fusiondirectory.po
+++ b/webservice/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/ca/fusiondirectory.po b/webservice/locale/ca/fusiondirectory.po
index 0ebd10b23998e3f05393605248b0e9605c9a864c..84f159c9743ab875a1f058999ef7837598538217 100644
--- a/webservice/locale/ca/fusiondirectory.po
+++ b/webservice/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/cs_CZ/fusiondirectory.po b/webservice/locale/cs_CZ/fusiondirectory.po
index 726afe8ea5a9bbc9ed1125bd19730cba103dd6ed..f1e19ab108e0308d899648f4e234ed86b8510eae 100644
--- a/webservice/locale/cs_CZ/fusiondirectory.po
+++ b/webservice/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+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 f2ad778dd9198d8e5a8a4ad95e6cec67ece4ca4e..93587e14ec057ddba1239afe0c0069736e987469 100644
--- a/webservice/locale/de/fusiondirectory.po
+++ b/webservice/locale/de/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -71,3 +71,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+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 582bdefd166473025e08335a0ecb793a2d7a9b56..5e3586874a3b6fd535740ad5b7835a93dd9efc04 100644
--- a/webservice/locale/el_GR/fusiondirectory.po
+++ b/webservice/locale/el_GR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -71,3 +71,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/en/fusiondirectory.po b/webservice/locale/en/fusiondirectory.po
index 18c64e5b70f52c4fc4e9d6f013dfa8bc21498758..4523dc80951dfcf3717da8f89c235ac6d70e3275 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: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-12-31 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr ""
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -52,23 +72,3 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/es/fusiondirectory.po b/webservice/locale/es/fusiondirectory.po
index 2b3c851875b092ea6aea8cfa22dcac4099c6ed0b..41bf12f6d25cb5b5ebbe4c3712f91339ecea9dc9 100644
--- a/webservice/locale/es/fusiondirectory.po
+++ b/webservice/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+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 229a9ab2a26064f1bec2b67fe4e30114a2caa8c6..2dd4566c2eda8949907e3b76502a3ed1bda506c1 100644
--- a/webservice/locale/es_CO/fusiondirectory.po
+++ b/webservice/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+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 bfba22404f6a8bb5717dc55fd0e1ce9112edc8df..388b2d5b8613adec9c60fd81927d6008ed587442 100644
--- a/webservice/locale/es_VE/fusiondirectory.po
+++ b/webservice/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+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 e876a8f237ce6caa242e4759784b31defb687522..f9cf9af0020307888146f0ada02aa8997d83e7c0 100644
--- a/webservice/locale/fa_IR/fusiondirectory.po
+++ b/webservice/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/fi_FI/fusiondirectory.po b/webservice/locale/fi_FI/fusiondirectory.po
index 58e499e375beb87671acba849ad4203845ee2dc9..e2a4e718d34ef8427356dcace34be60ef867e384 100644
--- a/webservice/locale/fi_FI/fusiondirectory.po
+++ b/webservice/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/fr/fusiondirectory.po b/webservice/locale/fr/fusiondirectory.po
index 133cc49de51362f79d54cfcb0ec726a2de7a72d1..dfddb6f3c25473e2bdcc313649985388f5278fe6 100644
--- a/webservice/locale/fr/fusiondirectory.po
+++ b/webservice/locale/fr/fusiondirectory.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
+# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2017
 # MCMic, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -72,3 +72,17 @@ msgstr "Méthode de mot de passe \"%s\" a échoué. Le compte \"%s\" n'a pas ét
 #, 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é!"
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, 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:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr "Impossible de trouver le compte \"%s\" dans LDAP"
+
+#: html/jsonrpc.php:664
+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 bca47b1cec856827c16bc85b47e4a9635e245359..47508e928eaa891a39a8be68836316f61e453650 100644
--- a/webservice/locale/hu_HU/fusiondirectory.po
+++ b/webservice/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/id/fusiondirectory.po b/webservice/locale/id/fusiondirectory.po
index aee53d8f77c2b20ef1d60faace3f37492b34efc4..7f3ce31e5b5707e37edf73638276f096435badc9 100644
--- a/webservice/locale/id/fusiondirectory.po
+++ b/webservice/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/it_IT/fusiondirectory.po b/webservice/locale/it_IT/fusiondirectory.po
index a473c46e2b334f940c4893ab099a3cd00db08fa4..7ab76a2be6880aa7f379f26618ee47431b10586a 100644
--- a/webservice/locale/it_IT/fusiondirectory.po
+++ b/webservice/locale/it_IT/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Paola Penati <penati@avaya.com>, 2015-2016
+# Paola Penati <penati@avaya.com>, 2015-2017
 # Paola Penati <penati@avaya.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-09-02 14:39+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-13 17:03+0000\n"
+"Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,3 +72,17 @@ msgstr "Il metodo di bloccaggio \"%s\" é fallito. L'account \"%s\" non é stato
 #, 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:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr "Impossibile ottenere metodo di password per l'account \"%s\". "
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr "Impossibile trovare  l'account \"%s\" nell'annuario LDAP"
+
+#: html/jsonrpc.php:664
+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 9522e89b46e7fa45bf09ba1ff512e4fae7803345..85c151d2b153bf94a8844b6b910151044378b309 100644
--- a/webservice/locale/lv/fusiondirectory.po
+++ b/webservice/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/nb/fusiondirectory.po b/webservice/locale/nb/fusiondirectory.po
index c02f1955cd7927be53307a2e7b4f9911fd05f7c2..e3c4b5f4d033886fbcb89224f7b6f73919b2f68c 100644
--- a/webservice/locale/nb/fusiondirectory.po
+++ b/webservice/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/nl/fusiondirectory.po b/webservice/locale/nl/fusiondirectory.po
index 46bbc83f2027229a8ef3ff4798e00341cf2852ac..b2d7ec4c38a0bbdf3551eb1cc84c70972240a5f9 100644
--- a/webservice/locale/nl/fusiondirectory.po
+++ b/webservice/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+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 7de55a36a258ad11608f515cbc200691a5dab61c..f3d2ece766ca0446d01a070046fe75f30b1258a4 100644
--- a/webservice/locale/pl/fusiondirectory.po
+++ b/webservice/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/pt/fusiondirectory.po b/webservice/locale/pt/fusiondirectory.po
index e49cb7339b66d97c89db5a4796444017b0eb48cd..f4e852e2595f99976a0d917a9e1deca5f91684d3 100644
--- a/webservice/locale/pt/fusiondirectory.po
+++ b/webservice/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/pt_BR/fusiondirectory.po b/webservice/locale/pt_BR/fusiondirectory.po
index 9efc1469f6f9f176c1d355121c40b05d54c7fe97..0882c5d305120aad5b33f86bb12bd66720b1e5fb 100644
--- a/webservice/locale/pt_BR/fusiondirectory.po
+++ b/webservice/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/ru/fusiondirectory.po b/webservice/locale/ru/fusiondirectory.po
index 93ddfb15c5591c84e3aa4abfa5d9fe53026f3a85..9d88ff7817e6717e5864fd977707faca519cb4d2 100644
--- a/webservice/locale/ru/fusiondirectory.po
+++ b/webservice/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-08-08 19:04+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/ru@petr1708/fusiondirectory.po b/webservice/locale/ru@petr1708/fusiondirectory.po
index 93cb1a4074e55a1f7154d539880d6bc5170fde01..7472fbfcd27b613201a834f33b6c87948b85b06c 100644
--- a/webservice/locale/ru@petr1708/fusiondirectory.po
+++ b/webservice/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/sv/fusiondirectory.po b/webservice/locale/sv/fusiondirectory.po
index c3fa580e234ac9c8772919c5076ddb68e1eaa6ab..fd9e42477eb68eb2d3662a09b7270c901f040eb0 100644
--- a/webservice/locale/sv/fusiondirectory.po
+++ b/webservice/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/ug/fusiondirectory.po b/webservice/locale/ug/fusiondirectory.po
index 202f1742b03bdbff358dd0972b316e73e692fc2c..eb902493edd815bbeca1520aa4a5f3d09e239f20 100644
--- a/webservice/locale/ug/fusiondirectory.po
+++ b/webservice/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/vi_VN/fusiondirectory.po b/webservice/locale/vi_VN/fusiondirectory.po
index 72a455d2f024a9e0617b372cab51d15bff1c171f..a550641f6e972e916b2002d647b10791524a9d9f 100644
--- a/webservice/locale/vi_VN/fusiondirectory.po
+++ b/webservice/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/zh/fusiondirectory.po b/webservice/locale/zh/fusiondirectory.po
index 980dd2c6d154fb624a4c2b3060e105af85f27cf5..7e63ab30d0678c9a9aae4a411d6523afa9c83725 100644
--- a/webservice/locale/zh/fusiondirectory.po
+++ b/webservice/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-06-28 11:05+0000\n"
+"POT-Creation-Date: 2017-01-11 21:15+0100\n"
+"PO-Revision-Date: 2017-01-11 20:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -70,3 +70,17 @@ msgstr ""
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
+
+#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:620
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:664
+msgid "This token is invalid"
+msgstr ""